Merge branch '1.6.x'

Conflicts:
	modules/bouncedcc.cpp
This commit is contained in:
J-P Nurmi
2015-09-20 23:36:44 +02:00
4 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -46,7 +46,7 @@ public:
AddHelpCommand();
AddCommand("delete", static_cast<CModCommand::ModCmdFunc>(&CCertMod::Delete),
"", "Delete the current certificate");
AddCommand("info", static_cast<CModCommand::ModCmdFunc>(&CCertMod::Info));
AddCommand("info", static_cast<CModCommand::ModCmdFunc>(&CCertMod::Info), "", "Show the current certificate");
}
virtual ~CCertMod() {}