diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2010-12-30 20:57:23 +0100 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2010-12-30 20:57:23 +0100 |
| commit | 83071e29cdcc5c292d6ea8e9782f9b94135f3dae (patch) | |
| tree | 1ec1d99251279a7c8a7d93fd32aad39a4f20c931 /npc/031-1_NivalisPort | |
| parent | b05725073e101b2e18224407d4d5624971471724 (diff) | |
| parent | b7dc8b21680e24675c61c868608f33ac596f2554 (diff) | |
| download | serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.tar.gz serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.tar.bz2 serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.tar.xz serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.zip | |
Merge branch 'master' of gitorious.org:~wombat/tmw-eathena-data/cache-serverdata
Conflicts:
npc/031-3_Cave/_mobs.txt
Diffstat (limited to 'npc/031-1_NivalisPort')
| -rw-r--r-- | npc/031-1_NivalisPort/_import.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/031-1_NivalisPort/_import.txt b/npc/031-1_NivalisPort/_import.txt index b1e59215..03490d66 100644 --- a/npc/031-1_NivalisPort/_import.txt +++ b/npc/031-1_NivalisPort/_import.txt @@ -1,6 +1,6 @@ map: 031-1.gat npc: npc/031-1_NivalisPort/_mobs.txt npc: npc/031-1_NivalisPort/_warps.txt -npc: npc/031-1_NivalisPort/frozenbeard.txt npc: npc/031-1_NivalisPort/angelaOutside.txt +npc: npc/031-1_NivalisPort/frozenbeard.txt npc: npc/031-1_NivalisPort/house.txt |