diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-19 19:23:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-19 19:23:23 +0100 |
| commit | 111a7d45f17fccdbff05a6afec222fe61684b860 (patch) | |
| tree | b8d2ef14e24b672b6eb19e47a372a97868e41c06 /contrib | |
| parent | 811c71d287eb5a11b82af223774563036cb3fedd (diff) | |
| parent | 78253fcbad69b28f1c0c3cfc7f8dcaecbb68c390 (diff) | |
| download | bitcoin-111a7d45f17fccdbff05a6afec222fe61684b860.tar.xz | |
Merge pull request #5470
78253fc Remove references to X11 licence (Michael Ford)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bitcoind.bash-completion | 2 | ||||
| -rwxr-xr-x | contrib/devtools/symbol-check.py | 2 | ||||
| -rwxr-xr-x | contrib/devtools/update-translations.py | 2 | ||||
| -rwxr-xr-x | contrib/linearize/linearize-data.py | 2 | ||||
| -rwxr-xr-x | contrib/linearize/linearize-hashes.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/contrib/bitcoind.bash-completion b/contrib/bitcoind.bash-completion index 37ece25899..3cc959c0a6 100644 --- a/contrib/bitcoind.bash-completion +++ b/contrib/bitcoind.bash-completion @@ -1,6 +1,6 @@ # bash programmable completion for bitcoind(1) and bitcoin-cli(1) # Copyright (c) 2012,2014 Christian von Roques <roques@mti.ag> -# Distributed under the MIT/X11 software license, see the accompanying +# Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. have bitcoind && { diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index f3999f1c0b..fad891f800 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -1,6 +1,6 @@ #!/usr/bin/python # Copyright (c) 2014 Wladimir J. van der Laan -# Distributed under the MIT/X11 software license, see the accompanying +# Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' A script to check that the (Linux) executables produced by gitian only contain diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py index 0be632069a..f955e4a1f2 100755 --- a/contrib/devtools/update-translations.py +++ b/contrib/devtools/update-translations.py @@ -1,6 +1,6 @@ #!/usr/bin/python # Copyright (c) 2014 Wladimir J. van der Laan -# Distributed under the MIT/X11 software license, see the accompanying +# Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' Run this script from the root of the repository to update all translations from diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py index f59fe9f6e7..4079844e33 100755 --- a/contrib/linearize/linearize-data.py +++ b/contrib/linearize/linearize-data.py @@ -3,7 +3,7 @@ # linearize-data.py: Construct a linear, no-fork version of the chain. # # Copyright (c) 2013-2014 The Bitcoin developers -# Distributed under the MIT/X11 software license, see the accompanying +# Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index dc7f654049..707dfcf87e 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -3,7 +3,7 @@ # linearize-hashes.py: List blocks in a linear, no-fork version of the chain. # # Copyright (c) 2013-2014 The Bitcoin developers -# Distributed under the MIT/X11 software license, see the accompanying +# Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # |