aboutsummaryrefslogtreecommitdiff
path: root/src/qt/Makefile.am
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-02-14 07:59:07 +0100
committerGavin Andresen <gavinandresen@gmail.com>2014-02-14 13:25:24 -0500
commit9a3d936fc2e98b1e8234bf27e09cf7bc22811bee (patch)
tree6c04425a46f658ed92568c7a2ede61a6754cbd40 /src/qt/Makefile.am
parent2b72d46f4232b58835d44aa3abd711df399d4728 (diff)
qt: GUI for conflicted transactions
- Exclamation mark icon for conflicted transactions - Show mouseover status for conflicted transactions as "conflicted" - Don't show inactive transactions on overview page overview
Diffstat (limited to 'src/qt/Makefile.am')
-rw-r--r--src/qt/Makefile.am1
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 \