aboutsummaryrefslogtreecommitdiff
path: root/init.cpp
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2011-04-15 03:58:28 -0400
committerJeff Garzik <jgarzik@pobox.com>2011-04-15 03:58:28 -0400
commita5843203574aba93a94df09eed9c922ec0f41d78 (patch)
treef8fb337c49ab85be2fa48eade2f788be34e85a2d /init.cpp
parentb37f09aa2e80b17028ad7fe1e87362c0f07c7406 (diff)
downloadbitcoin-a5843203574aba93a94df09eed9c922ec0f41d78.tar.xz
Ensure version number->string conversion is consistent
Diffstat (limited to 'init.cpp')
-rw-r--r--init.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/init.cpp b/init.cpp
index effac288fc..906bcbe137 100644
--- a/init.cpp
+++ b/init.cpp
@@ -143,7 +143,7 @@ bool AppInit2(int argc, char* argv[])
{
string beta = VERSION_IS_BETA ? _(" beta") : "";
string strUsage = string() +
- _("Bitcoin version") + " " + FormatVersion(VERSION) + pszSubVer + beta + "\n\n" +
+ _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
_("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
" bitcoin [options] \t " + "\n" +
" bitcoin [options] <command> [params]\t " + _("Send command to -server or bitcoind\n") +
@@ -262,7 +262,7 @@ bool AppInit2(int argc, char* argv[])
if (!fDebug && !pszSetDataDir[0])
ShrinkDebugFile();
printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
- printf("Bitcoin version %s%s%s\n", FormatVersion(VERSION).c_str(), pszSubVer, VERSION_IS_BETA ? _(" beta") : "");
+ printf("Bitcoin version %s\n", FormatFullVersion().c_str());
#ifdef GUI
printf("OS version %s\n", ((string)wxGetOsDescription()).c_str());
printf("System default language is %d %s\n", g_locale.GetSystemLanguage(), ((string)g_locale.GetSysName()).c_str());