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 /src/qt | |
| parent | bb8bc860e3445ca22209e6cc931bc4b1c139a3a1 (diff) | |
| parent | 4c237436359f5800ef29759deac570a6f897a8b3 (diff) | |
Merge remote-tracking branch 'jonasschnelli/new_icons' (#2497)
Conflicts:
doc/assets-attribution.txt
Diffstat (limited to 'src/qt')
| -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 |
4 files changed, 0 insertions, 0 deletions
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 |
