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 /src/primitives | |
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 'src/primitives')
-rw-r--r-- | src/primitives/block.cpp | 2 | ||||
-rw-r--r-- | src/primitives/block.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index 225bb80be8..cf7a392a32 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-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. #include "primitives/block.h" diff --git a/src/primitives/block.h b/src/primitives/block.h index a189592539..9c0a6decca 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2013 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. #ifndef BITCOIN_PRIMITIVES_BLOCK_H |