Merge branch 'master' into shared_mem

This commit is contained in:
KimLS
2013-02-22 22:36:30 -08:00
9 changed files with 25 additions and 16 deletions
+1 -1
View File
@@ -143,7 +143,7 @@ int main(int argc, char** argv) {
_log(WORLD__INIT, "Log settings loaded from %s", Config->LogSettingsFile.c_str());
_log(WORLD__INIT, "CURRENT_WORLD_VERSION:%s", CURRENT_WORLD_VERSION);
_log(WORLD__INIT, "CURRENT_VERSION: %s", CURRENT_VERSION);
#ifdef _DEBUG
_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);