diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-05-16 15:20:10 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-05-16 15:20:10 +0000 |
| commit | 9c025c897e112583b68de9d8545f81edb95dbe5c (patch) | |
| tree | 0712c68e84e8f12650d07a90420003b6fd9e1cdd /npc/scripts.conf | |
| parent | 25c4fee3bc0196a381b529f495bce8143ee0f501 (diff) | |
| parent | 25789740c889c6f37d31b32cebb741ab7cfeb869 (diff) | |
| download | serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.gz serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.bz2 serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.xz serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.zip | |
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline
Conflicts:
db/item_db.txt
npc/013-3_Cave/barrier.txt
Diffstat (limited to 'npc/scripts.conf')
| -rw-r--r-- | npc/scripts.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/npc/scripts.conf b/npc/scripts.conf index f7cede08..dda7d1ff 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -3,6 +3,7 @@ // NPC Functions npc: npc/functions/banker.txt npc: npc/functions/barber.txt +npc: npc/functions/clear_vars.txt npc: npc/functions/game_rules.txt npc: npc/functions/inn.txt npc: npc/functions/magic.txt @@ -47,8 +48,8 @@ import: npc/_import.txt // npc: npc/xmas/2007/after-xmas.txt // Easter 2008 -// npc: npc/easter2008/monsters.txt -// npc: npc/easter2008/npc.txt +// npc: npc/easter/2008/monsters.txt +// npc: npc/easter/2008/npc.txt // Halloween 2008 // npc: npc/halloween/2008/monsters.txt |