diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-21 12:11:03 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-21 12:11:03 +0200 |
| commit | 5061def42242ed424cfc96166095762811dc1c5f (patch) | |
| tree | 6f36a7ed2b8a8aaeafe06322d5b0dc93a9556970 /src/server/game/Scripting/ScriptMgr.h | |
| parent | e5e52406bd8d764e8f13a10279f197d262121c25 (diff) | |
| parent | 793c56b8b7dd7b90d8e3405449522849c2be8046 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.h')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 5d63844d946..0f670c3286a 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -19,8 +19,8 @@ #ifndef SC_SCRIPTMGR_H #define SC_SCRIPTMGR_H -#include <atomic> #include "Common.h" +#include <atomic> #include "DBCStores.h" #include "QuestDef.h" #include "SharedDefines.h" |