Vincent-Michael
644e75487d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
src/server/scripts/Kalimdor/zone_silithus.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
src/server/scripts/Spells/spell_item.cpp
2013-07-04 23:08:02 +02:00
..
2013-01-01 00:41:01 +01:00
2013-06-13 19:35:01 +02:00
2013-01-28 01:04:37 +00:00
2013-06-23 12:56:17 +02:00
2013-03-07 22:21:21 +01:00
2013-06-28 16:55:12 +02:00
2013-06-30 16:31:24 +02:00
2013-06-18 20:19:30 +02:00
2013-06-28 22:13:38 +02:00
2013-06-13 19:35:01 +02:00
2013-06-28 22:50:22 +02:00
2013-06-17 16:44:04 +02:00
2013-06-13 19:35:01 +02:00
2013-06-27 16:32:37 +02:00
2013-06-13 19:35:01 +02:00
2013-06-24 19:55:28 +02:00