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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Globals/ObjectMgr.cpp

2014-09-20 22:39:37 +02:00

..

AzjolNerub

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

2014-09-20 11:05:30 +02:00

ChamberOfAspects

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

2014-09-20 11:05:30 +02:00

CrusadersColiseum

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

2014-09-20 11:05:30 +02:00

DraktharonKeep

Core/Scripts: Fixed PCH build

2014-09-16 00:44:56 +02:00

FrozenHalls

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

2014-09-20 11:05:30 +02:00

Gundrak

Scripts/Gundrak: cleanup InstanceScript

2014-09-18 00:38:28 +02:00

IcecrownCitadel

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

2014-09-20 11:05:30 +02:00

Naxxramas

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

2014-09-20 11:05:30 +02:00

Nexus

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

2014-09-20 11:05:30 +02:00

Ulduar

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

2014-09-20 11:05:30 +02:00

UtgardeKeep

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

2014-09-20 11:05:30 +02:00

VaultOfArchavon

Merge branch 'ObjectGuid' of https://github.com/TrinityCore/TrinityCore

2014-09-16 21:50:01 +02:00

VioletHold

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

2014-09-20 22:39:37 +02:00

CMakeLists.txt

DB/Misc: Convert ulduar teleporter in sql

2014-06-14 20:03:55 +02:00

isle_of_conquest.cpp

Core: Fix build

2014-07-24 18:44:10 +02:00

zone_borean_tundra.cpp

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

2014-09-20 11:05:30 +02:00

zone_crystalsong_forest.cpp

Core/Scripts: Fixed build zone_* scripts

2014-09-15 23:57:03 +02:00

zone_dalaran.cpp

Merge branch 'master' into 4.3.4

2014-07-24 17:10:21 +01:00

zone_dragonblight.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-20 20:21:54 +02:00

zone_grizzly_hills.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-20 20:21:54 +02:00

zone_howling_fjord.cpp

Core/Scripts: Fixed build zone_* scripts

2014-09-15 23:57:03 +02:00

zone_icecrown.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-20 20:21:54 +02:00

zone_sholazar_basin.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-20 20:21:54 +02:00

zone_storm_peaks.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-09-20 20:21:54 +02:00

zone_wintergrasp.cpp

Core/Misc: multiple changes

2014-09-19 03:16:59 +02:00

zone_zuldrak.cpp

Core/Scripts: Fixed build zone_* scripts

2014-09-15 23:57:03 +02:00