aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-05-19 03:48:09 -0700
committerWladimir J. van der Laan <laanwj@gmail.com>2012-05-19 03:48:09 -0700
commite3f72a355545db4a9079e1f2353bd9a51deca350 (patch)
treebe0d7d2ab921479103dea875f2eed7f9a35bf1f0
parentd6615a54c6146728717ad0f8819f32f002613f5c (diff)
parent8a6a35e9d95251147afb64d8d56ec0c181c62631 (diff)
downloadbitcoin-e3f72a355545db4a9079e1f2353bd9a51deca350.tar.xz
Merge pull request #1362 from laanwj/2012_05_debugwindowicon2
Replace debug window icon with LGPL-licensed one (fixes #1348)
-rw-r--r--doc/assets-attribution.txt6
-rw-r--r--src/qt/res/icons/debugwindow.pngbin1392 -> 5402 bytes
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index bf3114f7b8..75062f7fef 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -55,6 +55,6 @@ Site: https://bitcointalk.org/index.php?topic=32273.0
License: Public domain
Icon: src/qt/res/icons/debugwindow.png
-Designer: Based on icon from Turbomilk
-Site: http://www.iconza.com/
-License: Free for commercial use
+Designer: Vignoni David
+Site: http://www.oxygen-icons.org/
+License: Oxygen icon theme is dual licensed. You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License.
diff --git a/src/qt/res/icons/debugwindow.png b/src/qt/res/icons/debugwindow.png
index 065399afe7..1712adf0e7 100644
--- a/src/qt/res/icons/debugwindow.png
+++ b/src/qt/res/icons/debugwindow.png
Binary files differ