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

Browse Source

Conflicts:
	doc/assets-attribution.txt

...

This commit is contained in:

Wladimir J. van der Laan

2013-04-11 06:57:27 +02:00

parent bb8bc860e3 4c23743635

commit 9a4eaf3cff

5 changed files with 3 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

src/qt/res/icons/bitcoin.ico

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 61 KiB After Width:  |  Height:  |  Size: 57 KiB

BIN

src/qt/res/icons/bitcoin_testnet.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 33 KiB

BIN

src/qt/res/icons/toolbar.png

Binary file not shown.

Side by Side Swipe Overlay 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.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.7 KiB