summaryrefslogtreecommitdiff
path: root/npc/014-1_Woodland
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2008-11-22 22:53:13 +0000
committerJared Adams <jaxad0127@gmail.com>2008-11-22 22:53:13 +0000
commitf8b3d027949a6349b7aee531c0b93459f9937ba4 (patch)
tree2823ee12c119bdb096af318b932b2e0b076848b7 /npc/014-1_Woodland
parentfc3b3af416688490595b01a43a7e9fbb6d96a3ae (diff)
parent2954ce1dee03714086a8c7952a24301cc4c65b60 (diff)
downloadserverdata-f8b3d027949a6349b7aee531c0b93459f9937ba4.tar.gz
serverdata-f8b3d027949a6349b7aee531c0b93459f9937ba4.tar.bz2
serverdata-f8b3d027949a6349b7aee531c0b93459f9937ba4.tar.xz
serverdata-f8b3d027949a6349b7aee531c0b93459f9937ba4.zip
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/map-renaming
Diffstat (limited to 'npc/014-1_Woodland')
-rw-r--r--npc/014-1_Woodland/_import.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
index 1ddf1947..6160ff13 100644
--- a/npc/014-1_Woodland/_import.txt
+++ b/npc/014-1_Woodland/_import.txt
@@ -1,6 +1,6 @@
map: 014-1.gat
+npc: npc/014-1_Woodland/_mobs.txt
+npc: npc/014-1_Woodland/_warps.txt
npc: npc/014-1_Woodland/monsters.txt
npc: npc/014-1_Woodland/taro.txt
npc: npc/014-1_Woodland/wedding-officiator.txt
-npc: npc/014-1_Woodland/_warps.txt
-npc: npc/014-1_Woodland/_mobs.txt