diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-22 08:30:54 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-22 08:31:06 +0100 |
| commit | 39fae6cfddb78d2aefa81a48472f885253cc42f1 (patch) | |
| tree | 1a5685133af5129c1373cc9fdec974bc0d1e9f46 /src/alert.cpp | |
| parent | 76a77059f361f3c700a550c11adf567bafebbd00 (diff) | |
| parent | b96f6a77f8a33fe39f480d4b1c617b7ba57d61b8 (diff) | |
| download | bitcoin-39fae6cfddb78d2aefa81a48472f885253cc42f1.tar.xz | |
Merge pull request #3720
b96f6a7 Remove "conflicted" as transaction category. (Wladimir J. van der Laan)
Diffstat (limited to 'src/alert.cpp')
0 files changed, 0 insertions, 0 deletions