summaryrefslogtreecommitdiff
path: root/conf/magic.conf.template
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-05-16 15:20:10 +0000
committerFate <fate-tmw@googlemail.com>2009-05-16 15:20:10 +0000
commit9c025c897e112583b68de9d8545f81edb95dbe5c (patch)
tree0712c68e84e8f12650d07a90420003b6fd9e1cdd /conf/magic.conf.template
parent25c4fee3bc0196a381b529f495bce8143ee0f501 (diff)
parent25789740c889c6f37d31b32cebb741ab7cfeb869 (diff)
downloadserverdata-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 'conf/magic.conf.template')
0 files changed, 0 insertions, 0 deletions