aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2013-04-11 06:57:27 +0200
committerWladimir J. van der Laan <[email protected]>2013-04-11 06:57:27 +0200
commit9a4eaf3cff9d37118939e38e7ce029a71e062ee9 (patch)
tree6fe4e640a983149739ac9fa636030d961aaad3ae /src
parentMerge pull request #2487 from Diapolo/translations (diff)
parentbetter quality windows .ICO icon file (diff)
downloaddiscoin-9a4eaf3cff9d37118939e38e7ce029a71e062ee9.tar.xz
discoin-9a4eaf3cff9d37118939e38e7ce029a71e062ee9.zip
Merge remote-tracking branch 'jonasschnelli/new_icons' (#2497)
Conflicts: doc/assets-attribution.txt
Diffstat (limited to 'src')
-rwxr-xr-xsrc/qt/res/icons/bitcoin.icobin62107 -> 57964 bytes
-rw-r--r--src/qt/res/icons/bitcoin_testnet.pngbin26315 -> 34143 bytes
-rw-r--r--src/qt/res/icons/toolbar.pngbin1035 -> 1687 bytes
-rw-r--r--src/qt/res/icons/toolbar_testnet.pngbin1037 -> 1727 bytes
4 files changed, 0 insertions, 0 deletions
diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico
index ad74552e9..8f5045015 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_testnet.png b/src/qt/res/icons/bitcoin_testnet.png
index 43b3d7b0e..d54125c0c 100644
--- a/src/qt/res/icons/bitcoin_testnet.png
+++ b/src/qt/res/icons/bitcoin_testnet.png
Binary files differ
diff --git a/src/qt/res/icons/toolbar.png b/src/qt/res/icons/toolbar.png
index 84c18e29f..44c7d88bc 100644
--- a/src/qt/res/icons/toolbar.png
+++ b/src/qt/res/icons/toolbar.png
Binary files differ
diff --git a/src/qt/res/icons/toolbar_testnet.png b/src/qt/res/icons/toolbar_testnet.png
index 90ed6d99f..9b5d82c78 100644
--- a/src/qt/res/icons/toolbar_testnet.png
+++ b/src/qt/res/icons/toolbar_testnet.png
Binary files differ