diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-02-19 13:23:42 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-02-19 13:23:42 +0000 |
| commit | 41a81ad3cb89f25ebb5af3cd7cb67f25081b7bf0 (patch) | |
| tree | 68ee9a17d03c488a7547cae8b51f8dc98e151bce /conf | |
| parent | 4c5b768b6ac5a561e96b492d66d44042227fb856 (diff) | |
| download | hercules-41a81ad3cb89f25ebb5af3cd7cb67f25081b7bf0.tar.gz hercules-41a81ad3cb89f25ebb5af3cd7cb67f25081b7bf0.tar.bz2 hercules-41a81ad3cb89f25ebb5af3cd7cb67f25081b7bf0.tar.xz hercules-41a81ad3cb89f25ebb5af3cd7cb67f25081b7bf0.zip | |
* Fixed 'feature.conf' not getting loaded and a typo buying store feature setting name (follow up to r14713).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14714 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/battle_athena.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf index 7cf56ce1b..a867382a7 100644 --- a/conf/battle_athena.conf +++ b/conf/battle_athena.conf @@ -62,6 +62,9 @@ import: conf/battle/skill.conf //Status change related settings import: conf/battle/status.conf +//Feature control (on/off) settings +import: conf/battle/feature.conf + // Anything else that didn't fit anywhere else. // Includes duel, day/night, mute/manner, log settings. import: conf/battle/misc.conf |