aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/assets-attribution.txt13
-rw-r--r--doc/bitcoin_logo_doxygen.pngbin5735 -> 4993 bytes
-rwxr-xr-x[-rw-r--r--]src/qt/res/icons/bitcoin.icobin15086 -> 62107 bytes
-rw-r--r--src/qt/res/icons/bitcoin.pngbin34168 -> 36486 bytes
-rw-r--r--src/qt/res/icons/bitcoin_testnet.pngbin28756 -> 26315 bytes
5 files changed, 9 insertions, 4 deletions
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index 05218e51b7..abcb9d8b3a 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -1,5 +1,8 @@
Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
- src/qt/res/src/*.svg
+ src/qt/res/src/clock_green.svg, src/qt/res/src/clock1.svg
+ src/qt/res/src/clock2.svg, src/qt/res/src/clock3.svg
+ src/qt/res/src/clock4.svg, src/qt/res/src/clock5.svg
+ src/qt/res/src/inout.svg, src/qt/res/src/questionmark.svg
Designer: Wladimir van der Laan
License: MIT
@@ -35,7 +38,7 @@ Designer: http://www.everaldo.com
Icon Pack: Crystal SVG
License: LGPL
-Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
+Icon: src/qt/res/icons/toolbar.png
Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
License: Public Domain
Site: https://bitcointalk.org/?topic=1756.0
@@ -56,6 +59,8 @@ 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.
-Icon: src/qt/res/icons/bitcoin.icns, src/qt/res/icons/bitcoin.svg
-Designer: Jonas Schnelli (original bitcoin logo from Bitboy)
+Icon: src/qt/res/icons/bitcoin.icns, src/qt/res/src/bitcoin.svg,
+ src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png,
+ src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png
+Designer: Jonas Schnelli (based on the original bitcoin logo from Bitboy)
License: MIT \ No newline at end of file
diff --git a/doc/bitcoin_logo_doxygen.png b/doc/bitcoin_logo_doxygen.png
index 5b41b02e18..1adae4c555 100644
--- a/doc/bitcoin_logo_doxygen.png
+++ b/doc/bitcoin_logo_doxygen.png
Binary files differ
diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico
index 01afd3c6da..ad74552e90 100644..100755
--- a/src/qt/res/icons/bitcoin.ico
+++ b/src/qt/res/icons/bitcoin.ico
Binary files differ
diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png
index bf43144e5e..c90471bd07 100644
--- a/src/qt/res/icons/bitcoin.png
+++ b/src/qt/res/icons/bitcoin.png
Binary files differ
diff --git a/src/qt/res/icons/bitcoin_testnet.png b/src/qt/res/icons/bitcoin_testnet.png
index ee2dc40563..43b3d7b0eb 100644
--- a/src/qt/res/icons/bitcoin_testnet.png
+++ b/src/qt/res/icons/bitcoin_testnet.png
Binary files differ