diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-19 19:57:46 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-19 19:57:46 +0200 |
| commit | 8a110f2645efdba4e15ddd13745b1b4110a7c8cb (patch) | |
| tree | 1197c8abce2c2acf0d2384663551df663ff1d220 /src/server/shared/Database/QueryResult.h | |
| parent | 5454e10b52c6e8c75afba25a1cc8fb13c6ef8dcc (diff) | |
| parent | 93a68a66c3009ea86569076ea05a39ce87dfb78d (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_gobject.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/Spells/spell_paladin.cpp
Diffstat (limited to 'src/server/shared/Database/QueryResult.h')
0 files changed, 0 insertions, 0 deletions