aboutsummaryrefslogtreecommitdiff
path: root/src/support/allocators
diff options
context:
space:
mode:
authorLuke Dashjr <[email protected]>2016-02-03 05:41:13 +0000
committerLuke Dashjr <[email protected]>2016-02-03 05:41:13 +0000
commita68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc (patch)
tree7e3932c75353499d6659b4f5a94b40e07e64c364 /src/support/allocators
parentWhen/if the copyright line does not mention Bitcoin Core developers, add a se... (diff)
parentMerge #7091: Consensus build package (diff)
downloaddiscoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.tar.xz
discoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.zip
Merge branch 'master' into single_prodname
Diffstat (limited to 'src/support/allocators')
-rw-r--r--src/support/allocators/secure.h2
-rw-r--r--src/support/allocators/zeroafterfree.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/support/allocators/secure.h b/src/support/allocators/secure.h
index 5e7bb66ea..1ec40fe83 100644
--- a/src/support/allocators/secure.h
+++ b/src/support/allocators/secure.h
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 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.
diff --git a/src/support/allocators/zeroafterfree.h b/src/support/allocators/zeroafterfree.h
index 41e23392e..28a940ad1 100644
--- a/src/support/allocators/zeroafterfree.h
+++ b/src/support/allocators/zeroafterfree.h
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 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.