Skip to content

Commit 78dae8c

Browse files
laanwjlaanwj
committed
Merge #13780: 0.17: Pre-branch maintenance
3fc2063 qt: Set BLOCK_CHAIN_SIZE = 220 (DrahtBot) 2b6a2f4 Regenerate manpages (DrahtBot) eb7daf4 Update copyright headers to 2018 (DrahtBot) Pull request description: Some trivial maintenance to avoid having to do it again after the 0.17 branch off. (The scripts to do this are in `./contrib/`) Tree-SHA512: 16b2af45e0351b1c691c5311d48025dc6828079e98c2aa2e600dc5910ee8aa01858ca6c356538150dc46fe14c8819ed8ec8e4ec9a0f682b9950dd41bc50518fa
2 parents 9d86aad + 3fc2063 commit 78dae8c

File tree

518 files changed

+843
-778
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

518 files changed

+843
-778
lines changed

‎contrib/devtools/copyright_header.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2016-2017 The Bitcoin Core developers
2+
# Copyright (c) 2016-2018 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

‎contrib/devtools/optimize-pngs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2014-2017 The Bitcoin Core developers
2+
# Copyright (c) 2014-2018 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
'''

‎contrib/devtools/security-check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2015-2017 The Bitcoin Core developers
2+
# Copyright (c) 2015-2018 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
'''

‎contrib/devtools/test-security-check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2015-2017 The Bitcoin Core developers
2+
# Copyright (c) 2015-2018 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
'''

‎contrib/linearize/linearize-data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# linearize-data.py: Construct a linear, no-fork version of the chain.
44
#
5-
# Copyright (c) 2013-2017 The Bitcoin Core developers
5+
# Copyright (c) 2013-2018 The Bitcoin Core developers
66
# Distributed under the MIT software license, see the accompanying
77
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
88
#

‎contrib/linearize/linearize-hashes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# linearize-hashes.py: List blocks in a linear, no-fork version of the chain.
44
#
5-
# Copyright (c) 2013-2017 The Bitcoin Core developers
5+
# Copyright (c) 2013-2018 The Bitcoin Core developers
66
# Distributed under the MIT software license, see the accompanying
77
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
88
#

‎contrib/macdeploy/custom_dsstore.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2013-2016 The Bitcoin Core developers
2+
# Copyright (c) 2013-2017 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
import biplist

‎contrib/seeds/makeseeds.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2013-2017 The Bitcoin Core developers
2+
# Copyright (c) 2013-2018 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
#

‎contrib/testgen/base58.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2012-2017 The Bitcoin Core developers
1+
# Copyright (c) 2012-2018 The Bitcoin Core developers
22
# Distributed under the MIT software license, see the accompanying
33
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
44
'''

‎contrib/testgen/gen_base58_test_vectors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2012-2017 The Bitcoin Core developers
2+
# Copyright (c) 2012-2018 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
'''

0 commit comments

Comments
 (0)