*Merge.

--HG-- branch : trunk
2009-05-25 11:31:19 -05:00
parent a53326353b 5d78a9c6bd
commit 4c6c9c560b
5 changed files with 7 additions and 3 deletions
@@ -141,9 +141,9 @@ enum WorldConfigs
    CONFIG_GM_IN_GM_LIST,
    CONFIG_GM_IN_WHO_LIST,
    CONFIG_GM_LOG_TRADE,
+    CONFIG_START_GM_LEVEL,
    CONFIG_ALLOW_GM_GROUP,
    CONFIG_ALLOW_GM_FRIEND,
-    CONFIG_START_GM_LEVEL,
    CONFIG_GM_LOWER_SECURITY,
    CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS,
    CONFIG_GROUP_VISIBILITY,