mirror of
https://github.com/jwinterm/myriadcoin.git
synced 2026-11-17 09:56:36 +01:00
Merge branch '0.4.x' into 0.5.x
Conflicts: src/bitcoinrpc.cpp src/init.cpp
This commit is contained in:
+1
-1
@@ -259,7 +259,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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user