diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -37,7 +37,7 @@ "src/univalue/", ] -INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.py'] +INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.mm', '*.py'] INCLUDE_COMPILED = re.compile( '|'.join([fnmatch.translate(m) for m in INCLUDE])) @@ -101,7 +101,6 @@ EXPECTED_HOLDER_NAMES = [ r"Satoshi Nakamoto\n", r"The Bitcoin Core developers\n", - r"Bitcoin Core Developers\n", r"The Bitcoin developers\n", r"BitPay Inc\.\n", r"University of Illinois at Urbana-Champaign\.\n", @@ -109,7 +108,6 @@ r"Wladimir J. van der Laan\n", r"Jeff Garzik\n", r"Jan-Klaas Kollhof\n", - r"Sam Rushing\n", r"ArtForz -- public domain half-a-node\n", r"Amaury SÉCHET\n", r"Intel Corporation\n", diff --git a/contrib/gitian-builder/contrib/devtools/github-merge.py b/contrib/gitian-builder/contrib/devtools/github-merge.py --- a/contrib/gitian-builder/contrib/devtools/github-merge.py +++ b/contrib/gitian-builder/contrib/devtools/github-merge.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016 Bitcoin Core Developers +# Copyright (c) 2016 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php.