Browse Source

Merge remote-tracking branch 'jonasschnelli/new_icons' (#2497)

Conflicts:
	doc/assets-attribution.txt
miguelfreitas
Wladimir J. van der Laan 12 years ago
parent
commit
9a4eaf3cff
  1. 8
      doc/assets-attribution.txt
  2. BIN
      src/qt/res/icons/bitcoin.ico
  3. BIN
      src/qt/res/icons/bitcoin_testnet.png
  4. BIN
      src/qt/res/icons/toolbar.png
  5. BIN
      src/qt/res/icons/toolbar_testnet.png

8
doc/assets-attribution.txt

@ -38,11 +38,6 @@ Designer: http://www.everaldo.com @@ -38,11 +38,6 @@ Designer: http://www.everaldo.com
Icon Pack: Crystal SVG
License: LGPL
Icon: src/qt/res/icons/toolbar.png, toolbar_testnet.png
Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
License: Public Domain
Site: https://bitcointalk.org/?topic=1756.0
Icon: scripts/img/reload.xcf (modified), src/qt/res/movies/update_spinner.mng
Icon Pack: Kids
Designer: Everaldo (Everaldo Coelho)
@ -61,6 +56,7 @@ License: Oxygen icon theme is dual licensed. You may copy it under the Creative @@ -61,6 +56,7 @@ License: Oxygen icon theme is dual licensed. You may copy it under the Creative
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
src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png,
src/qt/res/icons/toolbar.png, src/qt/res/icons/toolbar_testnet.png
Designer: Jonas Schnelli (based on the original bitcoin logo from Bitboy)
License: MIT

BIN
src/qt/res/icons/bitcoin.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 57 KiB

BIN
src/qt/res/icons/bitcoin_testnet.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 33 KiB

BIN
src/qt/res/icons/toolbar.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/qt/res/icons/toolbar_testnet.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Loading…
Cancel
Save