diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
| commit | 8b70df06b9454fe76765dd3044b378d4b3002002 (patch) | |
| tree | 8518b9c58642ae85d17bc62ae87d0501858b7bdd /npc/020-1_Nivalis/_import.txt | |
| parent | 96c8a2957d499b4dd7c867455bdff51920eb31ea (diff) | |
| parent | f17c823d6f91ae535ebcadd8b5b369efea09b772 (diff) | |
| download | serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.gz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.bz2 serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.xz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.zip | |
Merge branch 'master' of the testing branch
Conflicts:
conf/magic.conf
db/item_db.txt
npc/013-3_Cave/barrier.txt
Eliminated conf/magic.conf. Re-build this file using conf/build-magic.sh;
otherwise marriage will be disabled and spells won't work.
Diffstat (limited to 'npc/020-1_Nivalis/_import.txt')
| -rw-r--r-- | npc/020-1_Nivalis/_import.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/npc/020-1_Nivalis/_import.txt b/npc/020-1_Nivalis/_import.txt index cda51aa5..89ef0a63 100644 --- a/npc/020-1_Nivalis/_import.txt +++ b/npc/020-1_Nivalis/_import.txt @@ -1,6 +1,5 @@ map: 020-1.gat npc: npc/020-1_Nivalis/_mobs.txt npc: npc/020-1_Nivalis/_warps.txt -npc: npc/020-1_Nivalis/amrak.txt npc: npc/020-1_Nivalis/soul-menhir.txt npc: npc/020-1_Nivalis/startrek.txt |