diff options
| author | shennetsind <notind@gmail.com> | 2013-01-25 12:45:18 -0800 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-01-25 12:45:18 -0800 |
| commit | 762ea882f34c7821541135e32e217beb7930a52c (patch) | |
| tree | 89d1ef06a067e74dda88575bc0e6dd655f8ada93 /conf | |
| parent | 6864c961e1cfad9650d2343bf94a9e6b197360e3 (diff) | |
| parent | 754af15505f32237f8063e51ae9a1cb90788dff4 (diff) | |
| download | hercules-762ea882f34c7821541135e32e217beb7930a52c.tar.gz hercules-762ea882f34c7821541135e32e217beb7930a52c.tar.bz2 hercules-762ea882f34c7821541135e32e217beb7930a52c.tar.xz hercules-762ea882f34c7821541135e32e217beb7930a52c.zip | |
Merge pull request #3 from shennetsind/master
Dropping _athena conf suffixes
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/atcommand.conf (renamed from conf/atcommand_athena.conf) | 0 | ||||
| -rw-r--r-- | conf/battle.conf (renamed from conf/battle_athena.conf) | 0 | ||||
| -rw-r--r-- | conf/char-server.conf (renamed from conf/char_athena.conf) | 0 | ||||
| -rw-r--r-- | conf/inter-server.conf (renamed from conf/inter_athena.conf) | 0 | ||||
| -rw-r--r-- | conf/login-server.conf (renamed from conf/login_athena.conf) | 2 | ||||
| -rw-r--r-- | conf/logs.conf (renamed from conf/log_athena.conf) | 0 | ||||
| -rw-r--r-- | conf/map-server.conf (renamed from conf/map_athena.conf) | 2 | ||||
| -rw-r--r-- | conf/maps.conf (renamed from conf/maps_athena.conf) | 0 | ||||
| -rw-r--r-- | conf/messages.conf (renamed from conf/msg_athena.conf) | 0 | ||||
| -rw-r--r-- | conf/packet.conf (renamed from conf/packet_athena.conf) | 0 | ||||
| -rw-r--r-- | conf/script.conf (renamed from conf/script_athena.conf) | 0 | ||||
| -rw-r--r-- | conf/subnet.conf (renamed from conf/subnet_athena.conf) | 0 |
12 files changed, 2 insertions, 2 deletions
diff --git a/conf/atcommand_athena.conf b/conf/atcommand.conf index 5a0a5b289..5a0a5b289 100644 --- a/conf/atcommand_athena.conf +++ b/conf/atcommand.conf diff --git a/conf/battle_athena.conf b/conf/battle.conf index fe03deb7e..fe03deb7e 100644 --- a/conf/battle_athena.conf +++ b/conf/battle.conf diff --git a/conf/char_athena.conf b/conf/char-server.conf index bd2e2793c..bd2e2793c 100644 --- a/conf/char_athena.conf +++ b/conf/char-server.conf diff --git a/conf/inter_athena.conf b/conf/inter-server.conf index b116a6a88..b116a6a88 100644 --- a/conf/inter_athena.conf +++ b/conf/inter-server.conf diff --git a/conf/login_athena.conf b/conf/login-server.conf index d50935bd1..b75f50bd2 100644 --- a/conf/login_athena.conf +++ b/conf/login-server.conf @@ -157,5 +157,5 @@ client_hash_check: off client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5 client_hash: 99, cb1ea78023d337c38e8ba5124e2338ae -import: conf/inter_athena.conf +import: conf/inter-server.conf import: conf/import/login_conf.txt diff --git a/conf/log_athena.conf b/conf/logs.conf index bbe2f55c2..bbe2f55c2 100644 --- a/conf/log_athena.conf +++ b/conf/logs.conf diff --git a/conf/map_athena.conf b/conf/map-server.conf index 5caa65c47..e9c208e5b 100644 --- a/conf/map_athena.conf +++ b/conf/map-server.conf @@ -116,6 +116,6 @@ help2_txt: conf/help2.txt charhelp_txt: conf/charhelp.txt // Maps: -import: conf/maps_athena.conf +import: conf/maps.conf import: conf/import/map_conf.txt diff --git a/conf/maps_athena.conf b/conf/maps.conf index 9820bce44..9820bce44 100644 --- a/conf/maps_athena.conf +++ b/conf/maps.conf diff --git a/conf/msg_athena.conf b/conf/messages.conf index 7c3a8b8a4..7c3a8b8a4 100644 --- a/conf/msg_athena.conf +++ b/conf/messages.conf diff --git a/conf/packet_athena.conf b/conf/packet.conf index 0741ac013..0741ac013 100644 --- a/conf/packet_athena.conf +++ b/conf/packet.conf diff --git a/conf/script_athena.conf b/conf/script.conf index 309f8ee41..309f8ee41 100644 --- a/conf/script_athena.conf +++ b/conf/script.conf diff --git a/conf/subnet_athena.conf b/conf/subnet.conf index e91fb7376..e91fb7376 100644 --- a/conf/subnet_athena.conf +++ b/conf/subnet.conf |