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/002-1_Sandstorm/_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/002-1_Sandstorm/_import.txt')
-rw-r--r-- | npc/002-1_Sandstorm/_import.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt index 14adaccf..cb6b0a78 100644 --- a/npc/002-1_Sandstorm/_import.txt +++ b/npc/002-1_Sandstorm/_import.txt @@ -3,6 +3,5 @@ npc: npc/002-1_Sandstorm/_mobs.txt npc: npc/002-1_Sandstorm/_warps.txt npc: npc/002-1_Sandstorm/dark_mage.txt npc: npc/002-1_Sandstorm/merchant.txt -npc: npc/002-1_Sandstorm/monsters.txt npc: npc/002-1_Sandstorm/nomads.txt npc: npc/002-1_Sandstorm/rogue.txt |