summaryrefslogtreecommitdiff
path: root/world/map/npc/002-1/_import.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-06-21 22:43:54 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-06-21 22:43:54 +0200
commitc440eb273ff4dfeaccf62949629d8a4a606e72bf (patch)
tree15d909c07e5b146da57247531fabc22034fd13b6 /world/map/npc/002-1/_import.txt
parentb136ae7862fe6e36ba7e957c7ef91f6e5f1eacc1 (diff)
downloadserverdata-c440eb273ff4dfeaccf62949629d8a4a606e72bf.tar.gz
serverdata-c440eb273ff4dfeaccf62949629d8a4a606e72bf.tar.bz2
serverdata-c440eb273ff4dfeaccf62949629d8a4a606e72bf.tar.xz
serverdata-c440eb273ff4dfeaccf62949629d8a4a606e72bf.zip
Run 'make maps' for map changes and additions in and around Tulimshar.
Updated submodule pointer.
Diffstat (limited to 'world/map/npc/002-1/_import.txt')
-rw-r--r--world/map/npc/002-1/_import.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index f1ebfb77..2738eb37 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -4,9 +4,6 @@ map: 002-1.gat
npc: npc/002-1/_mobs.txt
npc: npc/002-1/_warps.txt
npc: npc/002-1/lieutenant_dausen.txt
-npc: npc/002-1/merchant.txt
npc: npc/002-1/nickos.txt
npc: npc/002-1/nomads.txt
-npc: npc/002-1/rogue.txt
-npc: npc/002-1/sandstorm_mine_barrier.txt
npc: npc/002-1/stewen.txt