[svn] Merge branch r50 with trunk.

--HG--
branch : trunk
This commit is contained in:
megamage committed 2008-10-17 21:44:37 -05:00
1 parent 16dcd37279
commit bac1fb628e
18 files changed
+4803 -1271

No files matched your search

@@ -2078,6 +2078,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"
>
@@ -2086,6 +2098,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"
>