diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-11-22 21:16:18 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-11-22 21:16:18 -0700 |
| commit | 60a35323982cd1fa660903092bef2b36899b3fcb (patch) | |
| tree | d04fb6ded771a025facabcbc644f52fb6f0b8f7c /npc/013-3_Cave/_import.txt | |
| parent | 13b743e2d48fcf45b7d394826b1bfe875e039b36 (diff) | |
| parent | 7d0a7521690fa9837ec0e35724b7f8a2ae591737 (diff) | |
| download | serverdata-60a35323982cd1fa660903092bef2b36899b3fcb.tar.gz serverdata-60a35323982cd1fa660903092bef2b36899b3fcb.tar.bz2 serverdata-60a35323982cd1fa660903092bef2b36899b3fcb.tar.xz serverdata-60a35323982cd1fa660903092bef2b36899b3fcb.zip | |
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/map-renaming
Conflicts:
npc/_import.txt
Diffstat (limited to 'npc/013-3_Cave/_import.txt')
| -rw-r--r-- | npc/013-3_Cave/_import.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/npc/013-3_Cave/_import.txt b/npc/013-3_Cave/_import.txt index 83f4256e..e4208f4f 100644 --- a/npc/013-3_Cave/_import.txt +++ b/npc/013-3_Cave/_import.txt @@ -1,3 +1,7 @@ map: 013-3.gat +npc: npc/013-3_Cave/barrier.txt +npc: npc/013-3_Cave/misc.txt npc: npc/013-3_Cave/_warps.txt npc: npc/013-3_Cave/_mobs.txt +npc: npc/013-3_Cave/mask_chest.txt +npc: npc/013-3_Cave/sword_chest.txt |