diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/031-1/_import.txt | |
parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/031-1/_import.txt')
-rw-r--r-- | world/map/npc/031-1/_import.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/world/map/npc/031-1/_import.txt b/world/map/npc/031-1/_import.txt index c8de7af8..7a1fc1cb 100644 --- a/world/map/npc/031-1/_import.txt +++ b/world/map/npc/031-1/_import.txt @@ -4,5 +4,6 @@ map: 031-1.gat npc: npc/031-1/_mobs.txt npc: npc/031-1/_warps.txt npc: npc/031-1/angelaOutside.txt +npc: npc/031-1/dock.txt npc: npc/031-1/frozenbeard.txt npc: npc/031-1/house.txt |