Merge branch 'bugfix_bip14_ez' of https://github.com/luke-jr/bitcoin

This commit is contained in:
Gavin Andresen 2012-02-22 10:44:44 -05:00
commit 1af97c95f3

View file

@ -21,7 +21,7 @@ using namespace boost;
// Name of client reported in the 'version' message. Report the same name
// for both bitcoind and bitcoin-qt, to make it harder for attackers to
// target servers or GUI users specifically.
const std::string CLIENT_NAME("bitcoin-qt");
const std::string CLIENT_NAME("Satoshi");
CCriticalSection cs_setpwalletRegistered;
set<CWallet*> setpwalletRegistered;