diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-07-02 11:36:52 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-07-02 11:37:05 -0400 |
| commit | c84349a148320c9570bc818053b96d1766eaeb27 (patch) | |
| tree | 88729428bb8004b0e44d173cce8cbe8daefafa4f /contrib/devtools/github-merge.py | |
| parent | 2f717fb5cdfc312784f9c1539fc41cdfcfbde452 (diff) | |
| parent | ca11606858a787c133983dcb1e0fea2ac54fc530 (diff) | |
Merge #16314: scripts and tools: Update copyright_header.py script
ca11606858a787c133983dcb1e0fea2ac54fc530 Fix: "Bitcoin Core" -> "The Bitcoin Core" (Hennadii Stepanov)
621463d7df0c644f4bf45550d3a75e134876480a Drop no-longer-relevant copyright holder name (Hennadii Stepanov)
01fafe55a1ab20870749dae01b437049ad4ce6e6 Include Objective-C source files (Hennadii Stepanov)
Pull request description:
Now the `copyright_header.py` script handles Objective-C source files `*.mm`:
```
src/qt/macdockiconhandler.mm
src/qt/macnotificationhandler.mm
src/qt/macos_appnap.mm
```
Also the only occurrence of `Bitcoin Core Developers` replaced with ubiquitous `The Bitcoin Core developers`.
EDITED:
The reason to remove "Sam Rushing" is (on master):
```
$ git grep "Sam Rushing"
contrib/devtools/copyright_header.py: "Sam Rushing\n",
```
ACKs for top commit:
laanwj:
code review ACK ca11606858a787c133983dcb1e0fea2ac54fc530
Tree-SHA512: 446c8fc569f732a6758e765f64110d9faeeffabb69088dd081d7bb730255c87196da96cea51081f4bd49280049fa4ed2ae22091059cb0f89bdc4ef8dd5e63cf0
Diffstat (limited to 'contrib/devtools/github-merge.py')
| -rwxr-xr-x | contrib/devtools/github-merge.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py index cd7a271e83..78ac671bfe 100755 --- a/contrib/devtools/github-merge.py +++ b/contrib/devtools/github-merge.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 Bitcoin Core Developers +# Copyright (c) 2016-2017 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -411,4 +411,3 @@ def main(): if __name__ == '__main__': main() - |