Merge branch 'master' into IPv6

This commit is contained in:
Jonathan Naylor 2020-09-05 22:17:07 +01:00
commit 91f04abddb
8 changed files with 55 additions and 5 deletions

View file

@ -172,12 +172,12 @@ unsigned int CConf::getLogFileLevel() const
std::string CConf::getLogFilePath() const
{
return m_logFilePath;
return m_logFilePath;
}
std::string CConf::getLogFileRoot() const
{
return m_logFileRoot;
return m_logFileRoot;
}
unsigned int CConf::getNetworkPort() const