diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-17 14:09:46 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-21 07:46:33 +0200 |
| commit | 3015e0bca6bc2cb8beb747873fdf7b80e74d679f (patch) | |
| tree | a66ed0fe4911a3bc3244f629f8871b286b6f0a35 /src/qt/guiconstants.h | |
| parent | 39d3f2cb40a539fff1daba3d76a6c59e932d0f0a (diff) | |
Revert "UI to alert of respend attempt affecting wallet."
This reverts commit ada5a067c75f19a724cc054286ecf2254e5dbe8f.
Conflicts:
src/qt/guiconstants.h
src/wallet.h
Diffstat (limited to 'src/qt/guiconstants.h')
| -rw-r--r-- | src/qt/guiconstants.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 696761e234..5ae4bc833d 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -23,10 +23,6 @@ static const int STATUSBAR_ICONSIZE = 16; #define COLOR_NEGATIVE QColor(255, 0, 0) /* Transaction list -- bare address (without label) */ #define COLOR_BAREADDRESS QColor(140, 140, 140) -/* Transaction list -- has conflicting transactions */ -#define COLOR_HASCONFLICTING QColor(255, 255, 255) -/* Transaction list -- has conflicting transactions - background */ -#define COLOR_HASCONFLICTING_BG QColor(192, 0, 0) /* Tooltips longer than this (in characters) are converted into rich text, so that they can be word-wrapped. |