github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-26 06:08:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source 
Conflicts:
	src/qt/transactiondesc.cpp
This commit is contained in:
Luke Dashjr
2012-10-09 23:17:43 +00:00
parent 638cecee77 cef36fad89
commit 4cf9b4c6fa
7 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bitcoinrpc.cpp
+1 -1
View File
@@ -1715,7 +1715,7 @@ Value encryptwallet(const Array& params, bool fHelp)
// slack space in .dat files; that is bad if the old data is
// unencrypted private keys. So:
StartShutdown();
return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet";
return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup.";
}