diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-01-12 08:02:59 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-01-12 08:02:59 -0700 |
| commit | 03e7550003650cb5cf79eb0c8d470ce8bd24ae27 (patch) | |
| tree | 437785d13b545d6562ba3b00513b8eb5a89c8f15 /npc/_import.txt | |
| parent | 647f4a35bf8831df4fe23754e824f4bdfb5dcf72 (diff) | |
| parent | 5db6cb7d6c09dbb091edbdf21a3e0e3feae3175a (diff) | |
| download | serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.gz serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.bz2 serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.xz serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.zip | |
Merge branch 'master' into magic
Conflicts:
db/item_db.txt
Diffstat (limited to 'npc/_import.txt')
| -rw-r--r-- | npc/_import.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/_import.txt b/npc/_import.txt index 626ecc37..142fd3ec 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -29,6 +29,7 @@ import: npc/013-3_Cave/_import.txt import: npc/014-1_Woodland/_import.txt import: npc/014-3_Cave/_import.txt import: npc/015-1_Woodland/_import.txt +import: npc/015-3/_import.txt import: npc/016-1_Woodland/_import.txt import: npc/017-1_Woodland_hills/_import.txt import: npc/018-1_Woodland_mining_camp/_import.txt |