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/transactionrecord.h | |
| 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/transactionrecord.h')
| -rw-r--r-- | src/qt/transactionrecord.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h index 8a7c9044e3..d7be0bc438 100644 --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -36,7 +36,8 @@ public: OpenUntilBlock, Offline, Unconfirmed, - HaveConfirmations + HaveConfirmations, + Conflicted }; bool confirmed; |