diff options
| author | Gavin Andresen <[email protected]> | 2011-04-15 11:41:39 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2011-04-15 11:41:39 -0400 |
| commit | a381eb8ddbad0a6924b856d0025b79562077edfb (patch) | |
| tree | 1ee5157bac2be75d11325eff0336c42dea275051 /init.cpp | |
| parent | build: add note for Snow Leopard users and fix typos in linking instructions (diff) | |
| parent | Send/return full bitcoin version string in Server and User-Agent HTTP headers (diff) | |
| download | discoin-a381eb8ddbad0a6924b856d0025b79562077edfb.tar.xz discoin-a381eb8ddbad0a6924b856d0025b79562077edfb.zip | |
Merge branch 'http-version' of https://github.com/jgarzik/bitcoin
Diffstat (limited to 'init.cpp')
| -rw-r--r-- | init.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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()); |