diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-14 14:40:32 -0500 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-14 14:40:32 -0500 |
commit | 05d3ded072d782036c31c1d773c0441b87de843e (patch) | |
tree | 1dcdec2f37f61415aa5d1b71da101e0cfbd035fd /src/qt/Makefile.am | |
parent | e051e65c219cc72a2bba768f3d5e043ad055b48e (diff) | |
parent | 9a3d936fc2e98b1e8234bf27e09cf7bc22811bee (diff) | |
download | bitcoin-05d3ded072d782036c31c1d773c0441b87de843e.tar.xz |
Merge pull request #3669 from gavinandresen/dead_txns
Handle "conflicted" transactions properly
Diffstat (limited to 'src/qt/Makefile.am')
-rw-r--r-- | src/qt/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 7de47291cc..030804db6e 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -243,6 +243,7 @@ RES_ICONS = \ res/icons/toolbar_testnet.png \ res/icons/transaction0.png \ res/icons/transaction2.png \ + res/icons/transaction_conflicted.png \ res/icons/tx_inout.png \ res/icons/tx_input.png \ res/icons/tx_output.png \ |