diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-05-16 15:20:10 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-05-16 15:20:10 +0000 |
| commit | 9c025c897e112583b68de9d8545f81edb95dbe5c (patch) | |
| tree | 0712c68e84e8f12650d07a90420003b6fd9e1cdd /npc/008-1_Hurnscald_outskirts/_import.txt | |
| parent | 25c4fee3bc0196a381b529f495bce8143ee0f501 (diff) | |
| parent | 25789740c889c6f37d31b32cebb741ab7cfeb869 (diff) | |
| download | serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.gz serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.bz2 serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.xz serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.zip | |
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline
Conflicts:
db/item_db.txt
npc/013-3_Cave/barrier.txt
Diffstat (limited to 'npc/008-1_Hurnscald_outskirts/_import.txt')
| -rw-r--r-- | npc/008-1_Hurnscald_outskirts/_import.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt index e3e92081..3101190e 100644 --- a/npc/008-1_Hurnscald_outskirts/_import.txt +++ b/npc/008-1_Hurnscald_outskirts/_import.txt @@ -1,6 +1,7 @@ map: 008-1.gat npc: npc/008-1_Hurnscald_outskirts/_mobs.txt npc: npc/008-1_Hurnscald_outskirts/_warps.txt +npc: npc/008-1_Hurnscald_outskirts/andra.txt npc: npc/008-1_Hurnscald_outskirts/dock_worker.txt npc: npc/008-1_Hurnscald_outskirts/george.txt npc: npc/008-1_Hurnscald_outskirts/hinnak.txt |