Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/qt/transactiondesc.cpp
This commit is contained in:
Luke Dashjr
2012-10-09 23:17:43 +00:00
7 changed files with 31 additions and 13 deletions
+1 -1
View File
@@ -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;
}