Merge branch '1.6.x'

Conflicts:
	src/Utils.cpp
This commit is contained in:
Alexey Sokolov
2015-04-18 17:57:51 +01:00
2 changed files with 4 additions and 3 deletions
+3 -2
View File
@@ -248,8 +248,9 @@ int main(int argc, char** argv) {
}
if (optind < argc) {
CUtils::PrintError("Specifying a config file as an argument isn't supported anymore.");
CUtils::PrintError("Use --datadir instead.");
CUtils::PrintError("Unrecognized command line arguments.");
CUtils::PrintError("Did you mean to run `/znc " + CString(argv[optind]) + "' in IRC client instead?");
CUtils::PrintError("Hint: `/znc " + CString(argv[optind]) + "' is an alias for `/msg *status " + CString(argv[optind]) + "'");
return 1;
}