Skip to content

Commit

Permalink
Merge pull request #21 from zathras-crypto/michael_z
Browse files Browse the repository at this point in the history
Minor labelling changes
  • Loading branch information
m21 committed Jun 21, 2014
2 parents e3dbd1a + 3570eab commit 85b2541
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/bitcoind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ bool AppInit(int argc, char* argv[])
fDaemon = GetBoolArg("-daemon", false);
if (fDaemon)
{
fprintf(stdout, "Bitcoin server starting\n");
fprintf(stdout, "Master Core server starting\n");

// Daemonize
pid_t pid = fork();
Expand Down
2 changes: 2 additions & 0 deletions src/rpcmisc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ Value getinfo(const Array& params, bool fHelp)
proxyType proxy;
GetProxy(NET_IPV4, proxy);

int mastercoreversion=10001;
Object obj;
obj.push_back(Pair("mastercoreversion", mastercoreversion));
obj.push_back(Pair("version", (int)CLIENT_VERSION));
obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION));
#ifdef ENABLE_WALLET
Expand Down

0 comments on commit 85b2541

Please sign in to comment.