diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-12-27 22:23:10 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-12-27 22:23:10 -0700 |
| commit | 781b8bbd160edf9a677fdd8075739ef378b6d57d (patch) | |
| tree | 523df5aa765d59294e6390c74e8aec0081c074f3 /npc/_import.txt | |
| parent | aacf6527a0ae9d440f9271906400825c9722275f (diff) | |
| parent | 2ac5a7006c550c5ee85d3070b07bdb327ff83ec1 (diff) | |
| download | serverdata-781b8bbd160edf9a677fdd8075739ef378b6d57d.tar.gz serverdata-781b8bbd160edf9a677fdd8075739ef378b6d57d.tar.bz2 serverdata-781b8bbd160edf9a677fdd8075739ef378b6d57d.tar.xz serverdata-781b8bbd160edf9a677fdd8075739ef378b6d57d.zip | |
Merge branch 'master' into magic
Diffstat (limited to 'npc/_import.txt')
| -rw-r--r-- | npc/_import.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/_import.txt b/npc/_import.txt index 74464305..626ecc37 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -32,7 +32,7 @@ import: npc/015-1_Woodland/_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 -import: npc/018-2_Woodland_minning_camp/_import.txt +import: npc/018-2_Woodland_mining_camp/_import.txt import: npc/018-3_Cave/_import.txt import: npc/019-1_Snow_field/_import.txt import: npc/020-1_Nivalis/_import.txt @@ -41,4 +41,4 @@ import: npc/020-3_Ice_cave/_import.txt import: npc/020-4_Ice_cave/_import.txt import: npc/021-1_Tulimshar/_import.txt import: npc/021-2_Tulimshar/_import.txt -import: npc/022-1_Beach_Cliffs/_import.txt +import: npc/023-1_Beach_Cliffs/_import.txt |