diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
| commit | 2a73e3544d6ac4d4f000c621753d70e8695e203c (patch) | |
| tree | b3784983e268ecf01a506229255116ac64fb0f57 /npc/002-3_Desert_mines/_warps.txt | |
| parent | 7464175373616085130e0d2e3b9ddc8e0322f291 (diff) | |
| parent | 3226368a1cd36e4d6e47302493fe5e0e91dddef3 (diff) | |
| download | serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.gz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.bz2 serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.xz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.zip | |
Merge commit 'mainline/master'
Conflicts:
conf/magic.conf
Diffstat (limited to 'npc/002-3_Desert_mines/_warps.txt')
| -rw-r--r-- | npc/002-3_Desert_mines/_warps.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/002-3_Desert_mines/_warps.txt b/npc/002-3_Desert_mines/_warps.txt index 8f5b51c2..d750d5cd 100644 --- a/npc/002-3_Desert_mines/_warps.txt +++ b/npc/002-3_Desert_mines/_warps.txt @@ -1,4 +1,4 @@ // 002-3 Desert mines warps -002-3.gat,38,30 warp CaveExit 2,-1,002-1.gat,25,95 002-3.gat,68,98 warp toLevel2 -1,-1,002-4.gat,34,98 +002-3.gat,37,29 warp Exit -1,-1,002-1.gat,25,95 |