summaryrefslogtreecommitdiff
path: root/npc/006-1_Desert_mountains
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/006-1_Desert_mountains
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/006-1_Desert_mountains')
-rw-r--r--npc/006-1_Desert_mountains/_import.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
index d1373469..aa3a86de 100644
--- a/npc/006-1_Desert_mountains/_import.txt
+++ b/npc/006-1_Desert_mountains/_import.txt
@@ -1,6 +1,6 @@
map: 006-1.gat
+npc: npc/006-1_Desert_mountains/_mobs.txt
+npc: npc/006-1_Desert_mountains/_warps.txt
npc: npc/006-1_Desert_mountains/mika.txt
-npc: npc/006-1_Desert_mountains/pachua.txt
npc: npc/006-1_Desert_mountains/monsters.txt
-npc: npc/006-1_Desert_mountains/_warps.txt
-npc: npc/006-1_Desert_mountains/_mobs.txt
+npc: npc/006-1_Desert_mountains/pachua.txt