diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-05 14:11:32 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-05 14:11:40 +0100 |
| commit | 605c17844ea32b6d237db6d83871164dc7d59dab (patch) | |
| tree | 637821238bd284d64579af7f831a7a450512b988 /src/merkleblock.cpp | |
| parent | aa413687de45ef9add61f97447532a87bd2b2bb7 (diff) | |
| parent | fa71669452e57039e4270fd2b33a0e0e1635b813 (diff) | |
Merge pull request #7205
fa71669 [devtools] Use git pretty-format for year parsing (MarcoFalke)
fa24439 Bump copyright headers to 2015 (MarcoFalke)
fa6ad85 [devtools] Rewrite fix-copyright-headers.py (MarcoFalke)
Diffstat (limited to 'src/merkleblock.cpp')
| -rw-r--r-- | src/merkleblock.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index f8e877df25..8447f924e4 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2009-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. |