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

Merge branch '0.4.x' into 0.5.x

Browse Source 
Conflicts:
	src/bitcoinrpc.cpp
	src/init.cpp
This commit is contained in:
Luke Dashjr
2012-10-09 23:16:24 +00:00
parent a7642282f6 b3f8f6ab94
commit cef36fad89
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bitcoinrpc.cpp
+1 -1
View File
@@ -1589,7 +1589,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.";
}