*Merge.

--HG-- branch : trunk
2009-02-08 21:58:49 -06:00
parent 709f3c4130 0058e7c20a
commit 94dd949c23
21 changed files with 462 additions and 193 deletions
@@ -140,6 +140,7 @@ SET(trinityscript_LIB_SRCS
   scripts/zone/coilfang_resevoir/steam_vault/def_steam_vault.h
   scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
   scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp
+   scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
   scripts/zone/darkshore/darkshore.cpp
   scripts/zone/deadmines/def_deadmines.h
   scripts/zone/deadmines/deadmines.cpp