summaryrefslogtreecommitdiff
path: root/npc/020-1/_import.txt
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/020-1/_import.txt
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/020-1/_import.txt')
-rw-r--r--npc/020-1/_import.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
index bae7c91f..2565ac9d 100644
--- a/npc/020-1/_import.txt
+++ b/npc/020-1/_import.txt
@@ -1,8 +1,8 @@
map: 020-1.gat
-npc: npc/020-1/startrek.txt
-npc: npc/020-1/soul-menhir.txt
-npc: npc/020-1/sexchanger.txt
-npc: npc/020-1/monsters.txt
-npc: npc/020-1/amrak.txt
-npc: npc/020-1/_warps.txt
npc: npc/020-1/_mobs.txt
+npc: npc/020-1/_warps.txt
+npc: npc/020-1/amrak.txt
+npc: npc/020-1/monsters.txt
+npc: npc/020-1/sexchanger.txt
+npc: npc/020-1/soul-menhir.txt
+npc: npc/020-1/startrek.txt