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

..

AzjolNerub

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-07-14 16:10:20 +01:00

ChamberOfAspects

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-07-14 16:10:20 +01:00

CrusadersColiseum

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

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

DraktharonKeep

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

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

FrozenHalls

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

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

Gundrak

Scripted: Some cleanups + ninja changes

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

IcecrownCitadel

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-07-14 16:10:20 +01:00

Naxxramas

Scripted: Some cleanups + ninja changes

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

Nexus

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

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

Ulduar

Core: Fix build

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

UtgardeKeep

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

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

VaultOfArchavon

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

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

VioletHold

Scripted: Some cleanups + ninja changes

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

CMakeLists.txt

Scripts/Ulduar: Yogg-Saron

2013-05-14 17:52:37 +02:00

isle_of_conquest.cpp

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

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

zone_borean_tundra.cpp

Scripted: Some cleanups + ninja changes

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

zone_crystalsong_forest.cpp

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

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

zone_dalaran.cpp

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-07-14 16:10:20 +01:00

zone_dragonblight.cpp

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

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

zone_grizzly_hills.cpp

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

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

zone_howling_fjord.cpp

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

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

zone_icecrown.cpp

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

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

zone_sholazar_basin.cpp

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

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

zone_storm_peaks.cpp

Scripted: Some cleanups + ninja changes

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

zone_wintergrasp.cpp

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

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

zone_zuldrak.cpp

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

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