aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-02-22 10:44:44 -0500
committerGavin Andresen <gavinandresen@gmail.com>2012-02-22 10:44:44 -0500
commit1af97c95f377245d359f309035011ac499239635 (patch)
tree7f66b7ed3b7af3ebcc08f07f75d0989488a702d4
parentf246fc648a26115587ae51090bde48b92c3a6a3b (diff)
parentc170d03e036553313bb9eb2e306146d6cc0f4ac6 (diff)
downloadbitcoin-1af97c95f377245d359f309035011ac499239635.tar.xz
Merge branch 'bugfix_bip14_ez' of https://github.com/luke-jr/bitcoin
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b73037fb6a..812386a801 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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;