iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
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
parent 5e337647b1 096dc5b320
commit 0d8bb7e597
11 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/keepnick.cpp
View File

@@ -192,7 +192,7 @@ public:
private:
// If this is nullptr, we are turned off for some reason
CKeepNickTimer* m_pTimer;
CKeepNickTimer* m_pTimer = nullptr;
};
CKeepNickTimer::CKeepNickTimer(CKeepNickMod *pMod) : CTimer(pMod, 30, 0,