Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost
Conflicts: src/server/game/World/World.cpp
This commit is contained in:
commit
151785b9ce
132 files changed
+4354
-5429
No files matched your search
@@ -130,7 +130,7 @@ int main(int argc, char** argv)
|
||||
TC_LOG_INFO("server.authserver", "<Ctrl-C> to stop.\n");
|
||||
TC_LOG_INFO("server.authserver", "Using configuration file %s.", configFile);
|
||||
|
||||
TC_LOG_WARN("server.authserver", "%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
|
||||
TC_LOG_INFO("server.authserver", "%s (Library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
|
||||
|
||||
// authserver PID file creation
|
||||
std::string pidFile = sConfigMgr->GetStringDefault("PidFile", "");
|
||||
|
||||
Reference in new issue
Block a user