diff options
| author | fanquake <fanquake@gmail.com> | 2019-12-31 20:35:41 +0300 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-12-31 20:52:26 +0300 |
| commit | 99813a9745fe10a58bedd7a4cb721faf14f907a4 (patch) | |
| tree | 2d2e168153c5e81ff2710226606f9ba70173f7d7 /src/consensus/merkle.h | |
| parent | 8830cb58abc888144a1edb9b2fba427716cc45d8 (diff) | |
| parent | aaaaad6ac95b402fe18d019d67897ced6b316ee0 (diff) | |
| download | bitcoin-99813a9745fe10a58bedd7a4cb721faf14f907a4.tar.xz | |
Merge #17829: scripted-diff: Bump copyright of files changed in 2019
aaaaad6ac95b402fe18d019d67897ced6b316ee0 scripted-diff: Bump copyright of files changed in 2019 (MarcoFalke)
Pull request description:
ACKs for top commit:
practicalswift:
ACK aaaaad6ac95b402fe18d019d67897ced6b316ee0
promag:
ACK aaaaad6ac95b402fe18d019d67897ced6b316ee0 🎉
fanquake:
ACK aaaaad6ac95b402fe18d019d67897ced6b316ee0 - going to merge this now because the year is over and conflicts are minimal.
Tree-SHA512: 58cb1f53bc4c1395b2766f36fabc7e2332e213780a802762fff0afd59468dad0c3265f553714d761c7a2c44ff90f7dc250f04458f4b2eb8eef8b94f8c9891321
Diffstat (limited to 'src/consensus/merkle.h')
| -rw-r--r-- | src/consensus/merkle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h index f28f76bd34..4ae5a5b897 100644 --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2018 The Bitcoin Core developers +// Copyright (c) 2015-2019 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. |