Vincent-Michael 56bd42dcf1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp

2013-07-15 18:04:04 +02:00

..

Auchindoun

Core: Fix build

2013-07-15 17:44:32 +02:00

BlackTemple

Core: Fix build

2013-07-15 01:07:02 +02:00

CoilfangReservoir

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

GruulsLair

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

HellfireCitadel

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-07-15 18:04:04 +02:00

TempestKeep

Core: Fix build

2013-07-15 01:07:02 +02:00

boss_doomlord_kazzak.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

boss_doomwalker.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

CMakeLists.txt

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30

zone_blades_edge_mountains.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

zone_hellfire_peninsula.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

zone_nagrand.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

zone_netherstorm.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

zone_shadowmoon_valley.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

zone_shattrath_city.cpp

Core/Quests: Fixed quest sharing

2013-07-11 21:45:14 +02:00

zone_terokkar_forest.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00

zone_zangarmarsh.cpp

Scripted: Some cleanups + ninja changes

2013-07-08 21:15:23 +02:00