aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-09-09 01:58:00 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2012-09-09 01:58:00 -0700
commiteabc8f2c81712dedd0d93af221e4dbc5b6dede59 (patch)
tree404736ac4ea5d7ebb4f18af2e48d7c4f2fc9693d
parentd8ecd21ff7f2fa823bf8205076f6b0700aa9d825 (diff)
parent23a44a7ad6e69027ff95a19165dda1cb8a4c2f9d (diff)
downloadbitcoin-eabc8f2c81712dedd0d93af221e4dbc5b6dede59.tar.xz
Merge pull request #1803 from luke-jr/md2k7_license
Apply MIT license to md2k7 art
-rw-r--r--contrib/debian/copyright3
-rw-r--r--doc/assets-attribution.txt1
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 71913c5a3a..b99604913c 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -55,8 +55,7 @@ Comment: Icon Pack: Human-O2
Files: src/qt/res/icons/transaction*.png
Copyright: md2k7
-License: You are free to do with these icons as you wish, including selling,
- copying, modifying etc.
+License: Expat
Comment: Site: https://bitcointalk.org/index.php?topic=15276.0
Files: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index 4a4ab08685..c66665d012 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -29,6 +29,7 @@ Designer: md2k7
Site: https://bitcointalk.org/index.php?topic=15276.0
License: You are free to do with these icons as you wish, including selling,
copying, modifying etc.
+License: MIT
Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,