*Merge.

--HG-- branch : trunk
2009-04-08 12:28:41 -05:00
parent fc7d2a5393 2ebeb198ad
commit 74d553bc4c
30 changed files with 3571 additions and 122 deletions
@@ -2220,10 +2220,26 @@
 					<Filter
 						Name="Battle for Mt. Hyjal"
 						>
+						<File
+							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_anetheron.cpp"
+							>
+						</File>
 						<File
 							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_archimonde.cpp"
 							>
 						</File>
+						<File
+							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_azgalor.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_kazrogal.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\caverns_of_time\hyjal\boss_rage_winterchill.cpp"
+							>
+						</File>
 						<File
 							RelativePath="..\scripts\zone\caverns_of_time\hyjal\def_hyjal.h"
 							>
@@ -2232,6 +2248,14 @@
 							RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjal.cpp"
 							>
 						</File>
+						<File
+							RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjal_trash.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjal_trash.h"
+							>
+						</File>
 						<File
 							RelativePath="..\scripts\zone\caverns_of_time\hyjal\hyjalAI.cpp"
 							>
@@ -2245,10 +2269,10 @@
 							>
 						</File>
 					</Filter>
+
 					<Filter
 						Name="Culling of Stratholme"
 						>
-					</Filter>
 					<Filter
 						Name="Old Hillsbrad"
 						>