diff options
author | Subv <s.v.h21@hotmail.com> | 2012-10-04 19:39:09 -0500 |
---|---|---|
committer | Subv <s.v.h21@hotmail.com> | 2012-10-04 19:39:09 -0500 |
commit | f7d3600e7e7ffaba971b77e4371a705e55593cfd (patch) | |
tree | 2d4e898bb4e09ede5dba97918741597da6fd2d2e /src/server/game/Pools/PoolMgr.cpp | |
parent | d2437407f4f7ad1af3baeb351626b41bd700065c (diff) | |
parent | 74707a08d3d63dc66e7b6943431c91f50258b0f9 (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
Diffstat (limited to 'src/server/game/Pools/PoolMgr.cpp')
-rwxr-xr-x | src/server/game/Pools/PoolMgr.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 79e8d47aa94..0d3d97d3996 100755 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -17,6 +17,7 @@ */ #include "PoolMgr.h" +#include "Containers.h" #include "ObjectMgr.h" #include "Log.h" #include "MapManager.h" |