summaryrefslogtreecommitdiff
path: root/npc/_import.txt
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-09-18 20:34:18 +0000
committerFate <fate-tmw@googlemail.com>2009-09-18 20:34:18 +0000
commit0738d6d97334d9127007e06bac87f23f4170534c (patch)
tree9df7182f023ce8c1500e4fd7377339e6c5cc5985 /npc/_import.txt
parentd1ac0ab81128a774a94d821fff331e6517d3471b (diff)
parent2f931153d914a90b3be73665a90251706f2b3170 (diff)
downloadserverdata-0738d6d97334d9127007e06bac87f23f4170534c.tar.gz
serverdata-0738d6d97334d9127007e06bac87f23f4170534c.tar.bz2
serverdata-0738d6d97334d9127007e06bac87f23f4170534c.tar.xz
serverdata-0738d6d97334d9127007e06bac87f23f4170534c.zip
Merge branch 'master' of gitorious.org:tmw-eathena-data/mainline
Diffstat (limited to 'npc/_import.txt')
-rw-r--r--npc/_import.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/_import.txt b/npc/_import.txt
index 403fb447..624cac46 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,6 +1,7 @@
import: npc/001-1_Tulimshar/_import.txt
import: npc/001-2_Tulimshar/_import.txt
import: npc/001-3_Tulimshar_arena/_import.txt
+import: npc/001-4_Omars_house/_import.txt
import: npc/002-1_Sandstorm/_import.txt
import: npc/002-3_Desert_mines/_import.txt
import: npc/002-4_Desert_mines/_import.txt