diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-10 04:26:44 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-10 04:26:44 -0600 |
| commit | 181f0c4b223bf995d080387e791034a0d93b72e1 (patch) | |
| tree | 81ae9b8250d19c035cd0cc8270085c58fce918ac /npc/020-1_Nivalis/_import.txt | |
| parent | e5ac95f237d5c96c39e3b5573d198138f855e30d (diff) | |
| parent | 7700a8695ed7710e2322ec1669353f7650f1a9b5 (diff) | |
| download | serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.tar.gz serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.tar.bz2 serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.tar.xz serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.zip | |
Merge commit 'mainline/master'
Conflicts:
npc/020-1_Nivalis/_import.txt
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 92d4b629..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/sexchanger.txt npc: npc/020-1_Nivalis/soul-menhir.txt npc: npc/020-1_Nivalis/startrek.txt |