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

Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.h
This commit is contained in:
Vincent_Michael
2013-01-02 14:12:48 +01:00
52 changed files with 1886 additions and 1018 deletions

View File

@@ -580,6 +580,9 @@ void AddSC_instance_arcatraz();
void AddSC_boss_high_botanist_freywinn(); //TK Botanica
void AddSC_boss_laj();
void AddSC_boss_warp_splinter();
void AddSC_boss_thorngrin_the_tender();
void AddSC_boss_commander_sarannis();
void AddSC_instance_the_botanica();
void AddSC_boss_alar(); //TK The Eye
void AddSC_boss_kaelthas();
void AddSC_boss_void_reaver();
@@ -1060,6 +1063,9 @@ void AddOutlandScripts()
AddSC_boss_high_botanist_freywinn(); //TK Botanica
AddSC_boss_laj();
AddSC_boss_warp_splinter();
AddSC_boss_thorngrin_the_tender();
AddSC_boss_commander_sarannis();
AddSC_instance_the_botanica();
AddSC_boss_alar(); //TK The Eye
AddSC_boss_kaelthas();
AddSC_boss_void_reaver();