Vincent_Michael
e8be55aa8b
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AI/CoreAI/TotemAI.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.h
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
2013-12-08 20:27:46 +01:00
..
2013-10-22 20:24:05 +02:00
2013-11-03 10:35:12 +02:00
2013-07-06 20:21:45 +01:00
2013-11-08 10:50:51 +01:00
2013-01-01 00:41:01 +01:00
2013-11-08 11:12:17 +01:00
2013-10-22 20:24:05 +02:00
2013-10-26 17:06:50 +02:00
2013-10-22 20:24:05 +02:00
2013-07-06 20:21:45 +01:00
2013-11-08 11:12:17 +01:00
2013-07-06 20:21:45 +01:00
2013-12-08 20:27:46 +01:00