Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

1 files changed, 5 insertions, 5 deletions

diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index 4a6aac43390..f7407e78aac 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -59,7 +59,7 @@
 #undef VERSION
 #endif //HAVE_CONFIG_H
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 #if COMPILER == COMPILER_MICROSOFT
 #   pragma warning(disable:4996)                            // 'function': was declared deprecated
@@ -76,7 +76,7 @@
 #endif                                                      // __SHOW_STUPID_WARNINGS__
 #endif                                                      // __GNUC__
 
-#include "Utilities/UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -100,8 +100,8 @@
 #include <sstream>
 #include <algorithm>
 
-#include "LockedQueue.h"
-#include "Threading.h"
+#include "Threading/LockedQueue.h"
+#include "Threading/Threading.h"
 
 #include <ace/Basic_Types.h>
 #include <ace/Guard_T.h>
@@ -168,7 +168,7 @@ enum TimeConstants
     WEEK   = DAY*7,
     MONTH  = DAY*30,
     YEAR   = MONTH*12,
-    IN_MILISECONDS = 1000
+    IN_MILLISECONDS = 1000
 };
 
 enum AccountTypes