diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-12-24 21:24:57 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-12-24 21:24:57 -0700 |
| commit | 562a0fdbaa002a49f4763bd07442e2ed32726ab9 (patch) | |
| tree | 0e997cd03f8a03e8bf839890318efd15a0242dc2 /conf | |
| parent | 63006fa540fe6fbddd132be33b39fd28f02a2e0f (diff) | |
| parent | e896b785935c661319ade424f473f4442e1878eb (diff) | |
| download | serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.tar.gz serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.tar.bz2 serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.tar.xz serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.zip | |
Merge branch 'master' into magic
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/char_local.conf.example | 2 | ||||
| -rw-r--r-- | conf/map_athena.conf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/char_local.conf.example b/conf/char_local.conf.example index 163f97c6..1d55c977 100644 --- a/conf/char_local.conf.example +++ b/conf/char_local.conf.example @@ -4,7 +4,7 @@ userid: s1 passwd: p1 -// Server name, use alternative character such as ASCII 160 for spaces. +// Server name, no more than 19 characters server_name: The Mana World // Wisp name for server: used to send wisp from server to players (between 4 to 23 characters) diff --git a/conf/map_athena.conf b/conf/map_athena.conf index 82e8c08b..f03c0123 100644 --- a/conf/map_athena.conf +++ b/conf/map_athena.conf @@ -13,5 +13,7 @@ mapreg_txt: save/mapreg.txt import: npc/scripts.conf +gm_log: gm.log + // local settings for this server in this file import: conf/map_local.conf |