Merge branch '1.6.x'

Conflicts:
	modules/cyrusauth.cpp
	modules/keepnick.cpp
	modules/notes.cpp
This commit is contained in:
Alexey Sokolov
2015-10-30 14:56:28 +00:00
11 changed files with 32 additions and 34 deletions
+2 -2
View File
@@ -22,8 +22,8 @@ using std::set;
class CClientNotifyMod : public CModule {
protected:
CString m_sMethod;
bool m_bNewOnly;
bool m_bOnDisconnect;
bool m_bNewOnly{};
bool m_bOnDisconnect{};
set<CString> m_sClientsSeen;