diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-12-19 19:23:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-12-19 19:23:23 +0100 |
| commit | 111a7d45f17fccdbff05a6afec222fe61684b860 (patch) | |
| tree | b8d2ef14e24b672b6eb19e47a372a97868e41c06 /doc | |
| parent | Merge pull request #2340 (diff) | |
| parent | Remove references to X11 licence (diff) | |
| download | discoin-111a7d45f17fccdbff05a6afec222fe61684b860.tar.xz discoin-111a7d45f17fccdbff05a6afec222fe61684b860.zip | |
Merge pull request #5470
78253fc Remove references to X11 licence (Michael Ford)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.md | 2 | ||||
| -rw-r--r-- | doc/README_windows.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/README.md b/doc/README.md index 73a268ee9..ecb8dc80f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -71,6 +71,6 @@ The Bitcoin repo's [root README](https://github.com/bitcoin/bitcoin/blob/master/ License --------------------- -Distributed under the [MIT/X11 software license](http://www.opensource.org/licenses/mit-license.php). +Distributed under the [MIT software license](http://www.opensource.org/licenses/mit-license.php). This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](https://www.openssl.org/). This product includes cryptographic software written by Eric Young ([[email protected]](mailto:[email protected])), and UPnP software written by Thomas Bernard. diff --git a/doc/README_windows.txt b/doc/README_windows.txt index 80e6f779a..5ac115205 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -2,7 +2,7 @@ Bitcoin 0.10.99 Copyright (c) 2009-2014 Bitcoin Core 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.
This product includes software developed by the OpenSSL Project for use in
the OpenSSL Toolkit (https://www.openssl.org/). This product includes
|