aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-04-11 06:57:27 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2013-04-11 06:57:27 +0200
commit9a4eaf3cff9d37118939e38e7ce029a71e062ee9 (patch)
tree6fe4e640a983149739ac9fa636030d961aaad3ae /src
parentbb8bc860e3445ca22209e6cc931bc4b1c139a3a1 (diff)
parent4c237436359f5800ef29759deac570a6f897a8b3 (diff)
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 ad74552e90..8f5045015d 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 43b3d7b0eb..d54125c0c6 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 84c18e29fa..44c7d88bca 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 90ed6d99f4..9b5d82c787 100644
--- a/src/qt/res/icons/toolbar_testnet.png
+++ b/src/qt/res/icons/toolbar_testnet.png
Binary files differ