diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:17:43 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:17:43 +0000 |
| commit | 4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d (patch) | |
| tree | cf8d0b8d7abef0be531d4788b0653b1286136971 /src/init.cpp | |
| parent | 638cecee77dba4bcffb225627f63658b247709ea (diff) | |
| parent | cef36fad891fba0fd8f5aec73bb17135b7fb133a (diff) | |
| download | bitcoin-4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/transactiondesc.cpp
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 116f3c1475..8aac160dda 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -260,7 +260,7 @@ bool AppInit2(int argc, char* argv[]) // On Windows, show a message box, as there is no stderr wxMessageBox(strUsage, "Usage"); #else - fprintf(stderr, "%s", strUsage.c_str()); + fprintf(stdout, "%s", strUsage.c_str()); #endif return false; } |