adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-03 08:21:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
Conflicts:
	src/Utils.cpp
This commit is contained in:
Alexey Sokolov
2015-04-18 17:57:51 +01:00
parent 144f7984e4 00404b8cbb
commit 21458de7d0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -148,7 +148,7 @@ Python modules are loaded through the global module [ModPython](http://wiki.znc.
## Further infos
Please visit http://znc.in/ or #znc on EFNet or freenode if you still have questions.
Please visit http://znc.in/ or #znc on freenode if you still have questions.
You can get the latest development version with git:
git clone git://github.com/znc/znc.git
src/main.cpp
+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;
}