[svn] Merge branch r50 with trunk.

--HG-- branch : trunk
2008-10-17 21:44:37 -05:00
parent 16dcd37279
commit bac1fb628e
18 changed files with 4803 additions and 1271 deletions
@@ -2076,6 +2076,18 @@
 				<Filter
 					Name="Zul&apos;Aman"
 					>
+					<File
+						RelativePath="..\scripts\zone\zulaman\boss_akilzon.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\scripts\zone\zulaman\boss_halazzi.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\scripts\zone\zulaman\boss_hexlord.cpp"
+						>
+					</File>
 					<File
 						RelativePath="..\scripts\zone\zulaman\boss_janalai.cpp"
 						>
@@ -2084,6 +2096,10 @@
 						RelativePath="..\scripts\zone\zulaman\boss_nalorakk.cpp"
 						>
 					</File>
+					<File
+						RelativePath="..\scripts\zone\zulaman\boss_zuljin.cpp"
+						>
+					</File>
 					<File
 						RelativePath="..\scripts\zone\zulaman\def_zulaman.h"
 						>