summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-05-30 20:03:41 +0000
committerFate <fate-tmw@googlemail.com>2009-05-30 20:03:41 +0000
commit8b70df06b9454fe76765dd3044b378d4b3002002 (patch)
tree8518b9c58642ae85d17bc62ae87d0501858b7bdd /data
parent96c8a2957d499b4dd7c867455bdff51920eb31ea (diff)
parentf17c823d6f91ae535ebcadd8b5b369efea09b772 (diff)
downloadserverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.gz
serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.bz2
serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.xz
serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.zip
Merge branch 'master' of the testing branch
Conflicts: conf/magic.conf db/item_db.txt npc/013-3_Cave/barrier.txt Eliminated conf/magic.conf. Re-build this file using conf/build-magic.sh; otherwise marriage will be disabled and spells won't work.
Diffstat (limited to 'data')
-rw-r--r--data/test.wlkbin0 -> 19042 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/data/test.wlk b/data/test.wlk
new file mode 100644
index 00000000..cf612ae7
--- /dev/null
+++ b/data/test.wlk
Binary files differ