summaryrefslogtreecommitdiff
path: root/npc/000-0
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-01-09 02:48:03 +0100
committerReid <reidyaro@gmail.com>2012-01-09 02:48:03 +0100
commit3dfef59b67b5e07a29e823cac0536ffad59e2fd1 (patch)
tree15d40682228d11a095f1688294bb88e24a4772eb /npc/000-0
parent405497181f9ac2bf60a68dbb38d222fbf0a018e8 (diff)
parent7f837fd0c5ff9c57ab37446824259cc0afc3bd6a (diff)
downloadserverdata-3dfef59b67b5e07a29e823cac0536ffad59e2fd1.tar.gz
serverdata-3dfef59b67b5e07a29e823cac0536ffad59e2fd1.tar.bz2
serverdata-3dfef59b67b5e07a29e823cac0536ffad59e2fd1.tar.xz
serverdata-3dfef59b67b5e07a29e823cac0536ffad59e2fd1.zip
Merge branch 'master' of gitorious.org:evol/serverdata-beta
Diffstat (limited to 'npc/000-0')
-rw-r--r--npc/000-0/_import.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt
index 79a1d1ec..77b7ed1c 100644
--- a/npc/000-0/_import.txt
+++ b/npc/000-0/_import.txt
@@ -1,4 +1,5 @@
map: 000-0.gat
npc: npc/000-0/_mobs.txt
npc: npc/000-0/_warps.txt
-npc: npc/000-0/sailors.txt \ No newline at end of file
+npc: npc/000-0/mapflags.txt
+npc: npc/000-0/sailors.txt