iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-03 20:12:29 +02: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/adminlog.cpp
View File

@@ -198,7 +198,7 @@ private:
LOG_TO_SYSLOG = 1 << 1,
LOG_TO_BOTH = LOG_TO_FILE | LOG_TO_SYSLOG
};
LogMode m_eLogMode;
LogMode m_eLogMode = LOG_TO_FILE;
CString m_sLogFile;
};