diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-08 18:57:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-08 18:57:16 -0600 |
| commit | e5ac95f237d5c96c39e3b5573d198138f855e30d (patch) | |
| tree | 09f6b19c3b119d563e3207c2901ce2cc506ee1bb /npc/023-1_Beach_Cliffs/_warps.txt | |
| parent | 2a73e3544d6ac4d4f000c621753d70e8695e203c (diff) | |
| parent | b073a508fb4c61ed3cb4f4cc62fc3d892480a6b8 (diff) | |
| download | serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.gz serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.bz2 serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.tar.xz serverdata-e5ac95f237d5c96c39e3b5573d198138f855e30d.zip | |
Merge commit 'mainline/master'
Conflicts:
data/021-2.wlk
data/023-1.wlk
Diffstat (limited to 'npc/023-1_Beach_Cliffs/_warps.txt')
| -rw-r--r-- | npc/023-1_Beach_Cliffs/_warps.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/npc/023-1_Beach_Cliffs/_warps.txt b/npc/023-1_Beach_Cliffs/_warps.txt index 8c3827bd..0090bda5 100644 --- a/npc/023-1_Beach_Cliffs/_warps.txt +++ b/npc/023-1_Beach_Cliffs/_warps.txt @@ -1,4 +1,2 @@ // 023-1 Beach Cliffs warps -023-1.gat,84,113 warp ToSandstorm 1,-1,002-1.gat,29,15 -023-1.gat,37,111 warp ToBeach 1,-1,003-1.gat,141,21 |