aboutsummaryrefslogtreecommitdiff
path: root/src/rpcwallet.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <[email protected]>2012-11-16 19:36:13 +0000
committerLuke Dashjr <[email protected]>2012-11-16 20:49:11 +0000
commitc07e181cca7c98898573716b7cce6e6ba26a8146 (patch)
tree299d78bd6f3085b16d8e72379f112c65a3c039a4 /src/rpcwallet.cpp
parentMerge branch '0.6.x' into 0.7.x (diff)
downloaddiscoin-c07e181cca7c98898573716b7cce6e6ba26a8146.tar.xz
discoin-c07e181cca7c98898573716b7cce6e6ba26a8146.zip
Revert NACK'd fixes for 0.7.2.
This reverts commits: - 220de9aafbdb76fa620531fc5c0b01ffa6616d7b Qt: small header changes / fixes - caeafd1bd1b217276005c6bb422136f379d881cf fix some double-spaces in strings - deb9f100a04dbb9c25d6ba320eba4c653a2f5423 fix some double-spaces in strings - 65cee0bbbdea49c08bc84be7824ab004cc19f57e don't use memset() in privacy/security relevant code parts - ff31f1fa10e2062465520ad8a3ff846c23b7a96f don't use memset() in privacy/security relevant code parts
Diffstat (limited to 'src/rpcwallet.cpp')
-rw-r--r--src/rpcwallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 65c5523c8..9e914f336 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -1396,7 +1396,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. The keypool has been flushed, you need to make a new backup.";
+ return "wallet encrypted; Bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed, you need to make a new backup.";
}
class DescribeAddressVisitor : public boost::static_visitor<Object>