diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-11 06:57:27 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-11 06:57:27 +0200 |
| commit | 9a4eaf3cff9d37118939e38e7ce029a71e062ee9 (patch) | |
| tree | 6fe4e640a983149739ac9fa636030d961aaad3ae | |
| parent | bb8bc860e3445ca22209e6cc931bc4b1c139a3a1 (diff) | |
| parent | 4c237436359f5800ef29759deac570a6f897a8b3 (diff) | |
Merge remote-tracking branch 'jonasschnelli/new_icons' (#2497)
Conflicts:
doc/assets-attribution.txt
| -rw-r--r-- | doc/assets-attribution.txt | 10 | ||||
| -rwxr-xr-x | src/qt/res/icons/bitcoin.ico | bin | 62107 -> 57964 bytes | |||
| -rw-r--r-- | src/qt/res/icons/bitcoin_testnet.png | bin | 26315 -> 34143 bytes | |||
| -rw-r--r-- | src/qt/res/icons/toolbar.png | bin | 1035 -> 1687 bytes | |||
| -rw-r--r-- | src/qt/res/icons/toolbar_testnet.png | bin | 1037 -> 1727 bytes |
5 files changed, 3 insertions, 7 deletions
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index f8dc320e1b..efd5c65a29 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -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 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
\ No newline at end of file +License: MIT diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico Binary files differindex ad74552e90..8f5045015d 100755 --- a/src/qt/res/icons/bitcoin.ico +++ b/src/qt/res/icons/bitcoin.ico diff --git a/src/qt/res/icons/bitcoin_testnet.png b/src/qt/res/icons/bitcoin_testnet.png Binary files differindex 43b3d7b0eb..d54125c0c6 100644 --- a/src/qt/res/icons/bitcoin_testnet.png +++ b/src/qt/res/icons/bitcoin_testnet.png diff --git a/src/qt/res/icons/toolbar.png b/src/qt/res/icons/toolbar.png Binary files differindex 84c18e29fa..44c7d88bca 100644 --- a/src/qt/res/icons/toolbar.png +++ b/src/qt/res/icons/toolbar.png diff --git a/src/qt/res/icons/toolbar_testnet.png b/src/qt/res/icons/toolbar_testnet.png Binary files differindex 90ed6d99f4..9b5d82c787 100644 --- a/src/qt/res/icons/toolbar_testnet.png +++ b/src/qt/res/icons/toolbar_testnet.png |
