*Merge.

--HG-- branch : trunk
2009-02-18 11:36:19 -06:00
parent 017f309b5b 7bff1c1d60
commit 31637d4aac
2384 changed files with 9729 additions and 969 deletions
@@ -129,3 +129,4 @@ class TRINITY_DLL_DECL Grid
        TypeMapContainer<WORLD_OBJECT_TYPES> i_objects;
 };
 #endif
+
@@ -76,3 +76,4 @@ class TRINITY_DLL_DECL GridLoader
        }
 };
 #endif
+
@@ -41,3 +41,4 @@ class GridRefManager : public RefManager<GridRefManager<OBJECT>, OBJECT>
        iterator rend() { return iterator(NULL); }
 };
 #endif
+
@@ -52,3 +52,4 @@ class TRINITY_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>,
        GridReference *next() { return (GridReference*)Reference<GridRefManager<OBJECT>, OBJECT>::next(); }
 };
 #endif
+
@@ -160,3 +160,4 @@ class TRINITY_DLL_DECL NGrid
        bool i_GridObjectDataLoaded;
 };
 #endif
+
@@ -128,3 +128,4 @@ class TRINITY_DLL_DECL TypeMapContainer
        ContainerMapList<OBJECT_TYPES> i_elements;
 };
 #endif
+
@@ -172,3 +172,4 @@ namespace Trinity

 }
 #endif
+
@@ -167,3 +167,4 @@ namespace Trinity

 }
 #endif
+
@@ -116,3 +116,4 @@ class TRINITY_DLL_DECL TypeContainerVisitor
        VISITOR &i_visitor;
 };
 #endif
+