diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2011-11-14 06:57:46 -0800 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-11-14 06:57:46 -0800 |
commit | e6a729d2d82d9bc092ace2836f7492106003cbf0 (patch) | |
tree | 645a6033bcafe7c1f4f65f3787bd90cb6ce1b9e4 | |
parent | 88a1b894527cf03462a50922fe2185ac53fc6c6d (diff) | |
parent | 0fe19a3a2c7c0f75d09f5558f876800e8b29ab14 (diff) |
Merge pull request #631 from luke-jr/free_icons
Free icons
-rw-r--r-- | contrib/debian/copyright | 59 | ||||
-rw-r--r-- | doc/assets-attribution.txt | 43 | ||||
-rw-r--r-- | src/qt/res/icons/address-book.png | bin | 1211 -> 1851 bytes | |||
-rw-r--r-- | src/qt/res/icons/export.png | bin | 1339 -> 2148 bytes | |||
-rw-r--r-- | src/qt/res/icons/history.png | bin | 746 -> 1432 bytes | |||
-rw-r--r-- | src/qt/res/icons/key.png | bin | 1239 -> 1727 bytes | |||
-rw-r--r-- | src/qt/res/icons/lock_closed.png | bin | 1237 -> 1679 bytes | |||
-rw-r--r-- | src/qt/res/icons/lock_open.png | bin | 1442 -> 1644 bytes | |||
-rw-r--r-- | src/qt/res/icons/overview.png | bin | 7015 -> 7936 bytes | |||
-rw-r--r-- | src/qt/res/icons/receive.png | bin | 1815 -> 1437 bytes | |||
-rw-r--r-- | src/qt/res/icons/send.png | bin | 1806 -> 1487 bytes | |||
-rw-r--r-- | src/qt/res/icons/synced.png | bin | 698 -> 781 bytes |
12 files changed, 25 insertions, 77 deletions
diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 546ffc6e1f..2da1461984 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -33,19 +33,21 @@ Files: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png, Copyright: Wladimir van der Laan License: CC-BY-3 -Files: src/qt/res/icons/send.png -Copyright: Icons Land -License: Freeware Non-commercial -Comment: Icon Pack: Vista Style Arrow - Site: http://findicons.com/icon/231371/right3green - -Files: src/qt/res/icons/address-book.png -Copyright: FatCow Web Hosting -License: CC-BY-3 -Comment: Icon Pack: Farm-Fresh Web - Site: http://findicons.com/icon/163938/book_open +Files: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png, + src/qt/res/icons/history.png, src/qt/res/icons/key.png, + src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png, + src/qt/res/icons/receive.png, src/qt/res/icons/send.png, + src/qt/res/icons/synced.png +Copyright: David Vignoni (david@icon-king.com) + ICON KING - www.icon-king.com +License: LGPL +Comment: NUVOLA ICON THEME for KDE 3.x + Original icons: kaddressbook, klipper_dock, view-list-text, + key-password, encrypted/decrypted, go-home, go-down, + go-next, dialog-ok + Site: http://www.icon-king.com/projects/nuvola/ -Files: src/qt/res/icons/connect*.png, src/qt/res/icons/synced.png, src/qt/res/icons/lock_*.png +Files: src/qt/res/icons/connect*.png Copyright: schollidesign License: GPL-3+ Comment: Icon Pack: Human-O2 @@ -65,24 +67,11 @@ Copyright: http://www.everaldo.com License: LGPL Comment: Icon Pack: Crystal SVG -Files: src/qt/res/icons/receive.png, src/qt/res/icons/history.png, - src/qt/res/icons/export.png -Copyright: Oxygen team -License: CC-BY-SA-3 -Comment: Icon Pack: Oxygen - Site: http://www.oxygen-icons.org/ - Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan) License: PUB-DOM Comment: Site: http://forum.bitcoin.org/?topic=1756.0 -Files: src/qt/res/icons/overview.png -Copyright: Jack Cai -License: CC-BY-ND-3 -Comment: Icon Pack: Primo - Site: http://findicons.com/icon/175944/home?id=176221# - Files: scripts/img/reload.xcf, src/qt/res/movies/update_spinner.mng Copyright: Everaldo (Everaldo Coelho) License: GPL-3+ @@ -94,12 +83,6 @@ License: PUB-DOM Copyright: Crobbo (forum) Comment: Site: https://bitcointalk.org/index.php?topic=32273.0 -Files: src/qt/res/icons/key.png -Copyright: VisualPharm (Ivan Boyko) -License: CC-BY-3 -Comment: Icon Pack: Must Have - Site: http://findicons.com/icon/51009/key?id=51009 - License: Expat Permission is hereby granted, free of charge, to any person obtaining a @@ -170,20 +153,6 @@ Comment: You can get a full copy of the license at <http://creativecommons.org/licenses/by/3.0/>. -License: CC-BY-ND-3 - This work is licensed under a Creative Commons Attribution-NoDerivs 3.0 - Unported License. -Comment: - You can get a full copy of the license at - <http://creativecommons.org/licenses/by-nd/3.0/>. - -License: CC-BY-ND-3 - This work is licensed under a Creative Commons Attribution-ShareAlike - 3.0 Unported License. -Comment: - You can get a full copy of the license at - <http://creativecommons.org/licenses/by-sa/3.0/>. - License: LGPL This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index 91d2e65804..8d23f7e59c 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -3,19 +3,18 @@ Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png, Designer: Wladimir van der Laan License: Creative Commons Attribution -Icon: src/qt/res/icons/send.png -Icon Pack: Vista Style Arrow -Designer: Icons Land -License: Freeware Non-commercial -Site: http://findicons.com/icon/231371/right3green - -Icon: src/qt/res/icons/address-book.png -Icon Pack: Farm-Fresh Web -Designer: FatCow Web Hosting -License: Creative Commons Attribution (by) -Site: http://findicons.com/icon/163938/book_open +Icon: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png, + src/qt/res/icons/history.png, src/qt/res/icons/key.png, + src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png, + src/qt/res/icons/receive.png, src/qt/res/icons/send.png, + src/qt/res/icons/synced.png +Icon Pack: NUVOLA ICON THEME for KDE 3.x +Designer: David Vignoni (david@icon-king.com) + ICON KING - www.icon-king.com +License: LGPL +Site: http://www.icon-king.com/projects/nuvola/ -Icon: src/qt/res/icons/connect*.png, src/qt/res/icons/synced.png, src/qt/res/icons/lock_*.png +Icon: src/qt/res/icons/connect*.png Icon Pack: Human-O2 Designer: schollidesign License: GNU/GPL @@ -35,24 +34,11 @@ Designer: http://www.everaldo.com Icon Pack: Crystal SVG License: LGPL -Icon: src/qt/res/icons/receive.png, src/qt/res/icons/history.png, - src/qt/res/icons/export.png -Designer: Oxygen team -Icon Pack: Oxygen -License: Creative Common Attribution-ShareAlike 3.0 License or LGPL -Site: http://www.oxygen-icons.org/ - Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan) License: Public Domain Site: http://forum.bitcoin.org/?topic=1756.0 -Icon: src/qt/res/icons/overview.png -Icon Pack: Primo -Designer: Jack Cai -License: Creative Commons Attribution No Derivatives (by-nd) -Site: http://findicons.com/icon/175944/home?id=176221# - Icon: scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng Icon Pack: Kids Designer: Everaldo (Everaldo Coelho) @@ -64,10 +50,3 @@ Designer: Crobbo (forum) Site: https://bitcointalk.org/index.php?topic=32273.0 License: Public domain -Icon: src/qt/res/icons/key.png -Designer: VisualPharm (Ivan Boyko) -Icon Pack: Must Have -Site: http://findicons.com/icon/51009/key?id=51009 -License: Creative Commons Attribution (by) - - diff --git a/src/qt/res/icons/address-book.png b/src/qt/res/icons/address-book.png Binary files differindex 1086fbeb63..dbfc28ab3d 100644 --- a/src/qt/res/icons/address-book.png +++ b/src/qt/res/icons/address-book.png diff --git a/src/qt/res/icons/export.png b/src/qt/res/icons/export.png Binary files differindex 69d59a38d2..1df9c2398d 100644 --- a/src/qt/res/icons/export.png +++ b/src/qt/res/icons/export.png diff --git a/src/qt/res/icons/history.png b/src/qt/res/icons/history.png Binary files differindex 60f1351783..10ac0e1592 100644 --- a/src/qt/res/icons/history.png +++ b/src/qt/res/icons/history.png diff --git a/src/qt/res/icons/key.png b/src/qt/res/icons/key.png Binary files differindex 757cad47ed..ece0164f77 100644 --- a/src/qt/res/icons/key.png +++ b/src/qt/res/icons/key.png diff --git a/src/qt/res/icons/lock_closed.png b/src/qt/res/icons/lock_closed.png Binary files differindex ce8da0bec7..c566510c40 100644 --- a/src/qt/res/icons/lock_closed.png +++ b/src/qt/res/icons/lock_closed.png diff --git a/src/qt/res/icons/lock_open.png b/src/qt/res/icons/lock_open.png Binary files differindex 6a3a8edb23..c98ca8663b 100644 --- a/src/qt/res/icons/lock_open.png +++ b/src/qt/res/icons/lock_open.png diff --git a/src/qt/res/icons/overview.png b/src/qt/res/icons/overview.png Binary files differindex 6b94b43a2c..3b90fe5569 100644 --- a/src/qt/res/icons/overview.png +++ b/src/qt/res/icons/overview.png diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png Binary files differindex e8f418a4f8..53ad1d1565 100644 --- a/src/qt/res/icons/receive.png +++ b/src/qt/res/icons/receive.png diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png Binary files differindex 55ce550b4f..ceb91ea66d 100644 --- a/src/qt/res/icons/send.png +++ b/src/qt/res/icons/send.png diff --git a/src/qt/res/icons/synced.png b/src/qt/res/icons/synced.png Binary files differindex 8e428b6a70..4d7e0e8821 100644 --- a/src/qt/res/icons/synced.png +++ b/src/qt/res/icons/synced.png |