aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-10-14 20:47:56 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2012-10-14 20:49:06 +0200
commit485d667748b776a1932e3e14dc1b9dfe2ba841d0 (patch)
tree6a8346def039328a48f365c5b41c6a12d12d3dbe /doc
parent199d88cf901866f3c2fa2b5bd83074d11ebad02c (diff)
downloadbitcoin-485d667748b776a1932e3e14dc1b9dfe2ba841d0.tar.xz
Revert "Merge pull request #1931 from laanwj/2012_10_newicons"
This reverts commit 199d88cf901866f3c2fa2b5bd83074d11ebad02c, reversing changes made to 65bc1573e73791c26472c3177732b7d167aa5bec. License is worse instead of better. Will only accept public domain and MIT-licensed icons from now on.
Diffstat (limited to 'doc')
-rw-r--r--doc/assets-attribution.txt20
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index d6f90da640..0693d535c3 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -14,11 +14,11 @@ Designer: David Vignoni (david@icon-king.com)
License: LGPL
Site: http://www.icon-king.com/projects/nuvola/
-Icon: src/qt/res/icons/connect*.png (edited, originally Wireless Signal.png)
-Icon Pack: The Clean Desk
-Designer: Alfred Pereira
-License: freeware
-Site: http://cdn.365psd.com/wp-content/uploads/2012/03/The-Clean-Desk-Set.zip and http://findicons.com/icon/547785/wireless_signal?id=547912
+Icon: src/qt/res/icons/connect*.png
+Icon Pack: Human-O2
+Designer: schollidesign
+License: GNU/GPL
+Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0
Icon: src/qt/res/icons/transaction*.png
Designer: md2k7
@@ -40,11 +40,11 @@ Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
License: Public Domain
Site: https://bitcointalk.org/?topic=1756.0
-Movie: src/qt/res/movies/update_spinner.mng
-Site: http://preloaders.net/en/circular
-License: You are encouraged and legally entitled to copy and modify any animated GIF and APNG images, generated by http://preloaders.net web-site.
-All animated GIF and APNG images are completely free to use in all projects (web and desktop applications, freeware and commercial projects), WITH THE EXCEPTION of any other animated images generator applications
-You are encouraged, but NOT obligated to place any reference to http://preloaders.net web-site to use it's content in any projects and applications.
+Icon: scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng
+Icon Pack: Kids
+Designer: Everaldo (Everaldo Coelho)
+License: GNU/GPL
+Site: http://findicons.com/icon/17102/reload?id=17102
Image: src/qt/res/images/splash2.jpg (Wallet image)
Designer: Crobbo (forum)