summaryrefslogtreecommitdiff
path: root/data/resnametable.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-06-17 13:29:58 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-06-17 13:29:58 +0200
commitdb53017bd8172d7679b2ce3e7cc6c67927031f2c (patch)
tree6777db7b72f0329937f17153ddfa3567695d45ea /data/resnametable.txt
parentc0fa45992b123f08e91e86dac11aca765ea73cd2 (diff)
parent246072120a1edcba61a350bad56049f110457489 (diff)
downloadserverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.gz
serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.bz2
serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.tar.xz
serverdata-db53017bd8172d7679b2ce3e7cc6c67927031f2c.zip
Merge gitorious.org:~jenalya/tmw-eathena-data/wip-serverdata
Conflicts: db/const.txt npc/022-1_Tulimshar/_import.txt npc/_import.txt
Diffstat (limited to 'data/resnametable.txt')
-rw-r--r--data/resnametable.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 0db3e9a5..fa526488 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -78,4 +78,7 @@
032-3.gat#032-3.wlk#
033-1.gat#033-1.wlk#
034-1.gat#034-1.wlk#
+041-1.gat#041-1.wlk#
+042-1.gat#042-1.wlk#
+042-2.gat#042-2.wlk#
botcheck.gat#botcheck.wlk#