Merge branch '0.4.x' into 0.5.x

This commit is contained in:
Luke Dashjr
2012-05-04 18:55:15 +00:00
4 changed files with 11 additions and 4 deletions
-1
View File
@@ -175,7 +175,6 @@ public:
}
int LoadWallet(bool& fFirstRunRet);
// bool BackupWallet(const std::string& strDest);
bool SetAddressBookName(const CBitcoinAddress& address, const std::string& strName);