diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2012-12-26 02:06:43 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2012-12-26 02:06:43 +0100 |
| commit | 5d30811397e258ad368e4edc3398444e520c273b (patch) | |
| tree | 5fe1bd50dbf69c3f972c939035ef19718255dc62 /src/server | |
| parent | 3742205866e76ff1e5078da5fd20de2a7bab6f83 (diff) | |
| parent | a01087295b4d243f1e4c8b17cfe4eaef96b47111 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Quests/QuestDef.h
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Quests/QuestDef.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index b0a1bc60f7c..d8cb8cdbb4e 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -23,6 +23,7 @@ #include "DatabaseEnv.h" #include "SharedDefines.h" #include "WorldPacket.h" +#include "DBCEnums.h" #include <string> #include <vector> |