Merge pull request #352 from TheBlueMatt/newenc

Wallet Private Key Encryption (on CWallet)
2011-07-12 19:10:12 -07:00
parent 354f2dd094 7414733bea
commit 0bad8e4237
24 changed files with 1589 additions and 161 deletions
--- a/src/main.h
+++ b/src/main.h
@@ -70,7 +70,6 @@ extern std::set<CWallet*> setpwalletRegistered;
 // Settings
 extern int fGenerateBitcoins;
 extern int64 nTransactionFee;
-extern CAddress addrIncoming;
 extern int fLimitProcessors;
 extern int nLimitProcessors;
 extern int fMinimizeToTray;