*Merge.

--HG-- branch : trunk
2009-02-17 21:54:48 -06:00
parent be53cfe104 3931b802f1
commit 89ba43ef3e
2389 changed files with 3438 additions and 836 deletions
@@ -142,3 +142,4 @@ class TRINITY_DLL_DECL MapManager : public Trinity::Singleton<MapManager, Trinit
        uint32 i_MaxInstanceId;
 };
 #endif
+