git://git.novaco.in
/
novacoin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
Merge branch '0.5.x' into 0.6.0.x
[novacoin.git]
/
src
/
qt
/
walletmodel.h
diff --git
a/src/qt/walletmodel.h
b/src/qt/walletmodel.h
index
4123240
..
e78773f
100644
(file)
--- a/
src/qt/walletmodel.h
+++ b/
src/qt/walletmodel.h
@@
-34,8
+34,7
@@
public:
DuplicateAddress,
TransactionCreationFailed, // Error returned when wallet is still locked
TransactionCommitFailed,
- Aborted,
- MiscError
+ Aborted
};
enum EncryptionStatus