diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-16 11:15:40 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-16 11:15:41 +0100 |
| commit | bb3c75bdf48cf04f97fa84f494f7366fac99e379 (patch) | |
| tree | 5296d36bb6221baf8ec222e102afdd9d8dcbbe60 /src/qt/res/bitcoin-qt-res.rc | |
| parent | f3af0c898f1ba280761101844c4694c7427f304a (diff) | |
| parent | ac23394ea8118fe50131513bcd68c822a7ac4095 (diff) | |
| download | bitcoin-bb3c75bdf48cf04f97fa84f494f7366fac99e379.tar.xz | |
Merge pull request #5228
ac23394 resize tray icon because a 1024x1024 icon won't show in ubuntu (bug) (Jonas Schnelli)
8e76ca0 Qt: Go back to using QIcon functionality for scaling (Wladimir J. van der Laan)
54f2571 Qt: HiDPI (retina) support for splash screen (Jonas Schnelli)
Diffstat (limited to 'src/qt/res/bitcoin-qt-res.rc')
| -rw-r--r-- | src/qt/res/bitcoin-qt-res.rc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index 809235be5f..a72dfc02f6 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -1,5 +1,4 @@ IDI_ICON1 ICON DISCARDABLE "icons/bitcoin.ico" -IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico" #include <windows.h> // needed for VERSIONINFO #include "../../clientversion.h" // holds the needed client version information |