*Merge.

--HG-- branch : trunk
2009-01-18 17:58:13 -06:00
parent 54ed397413 613217fca7
commit c85c89dc0b
68 changed files with 1508 additions and 1553 deletions
@@ -193,6 +193,9 @@ enum WorldConfigs
    CONFIG_ARENA_SEASON_IN_PROGRESS,
    CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER,
    CONFIG_SKILL_MILLING,
+	CONFIG_FLYING_MOUNTS_AZEROTH,
+    CONFIG_FLYING_MOUNTS_OUTLAND,
+    CONFIG_FLYING_MOUNTS_OTHERS,

    CONFIG_MAX_WHO,
    CONFIG_BG_START_MUSIC,