diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-01-22 19:16:10 +0000 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-01-22 19:16:10 +0000 |
commit | ad401e02f0602dd9f0905ce290441b10e46ff75a (patch) | |
tree | 6040b4f38e071999b9ef650b8abc0d082c768e45 /npc/001-1_Tulimshar/merchant.txt | |
parent | b33e9b4508101d7097ed684c7c3316cb48a4f995 (diff) | |
parent | 96352cdf87009db08ca68a3c3deee577a981adb8 (diff) | |
download | serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.gz serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.bz2 serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.xz serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.zip |
Merge commit 'origin/master' into magic
Diffstat (limited to 'npc/001-1_Tulimshar/merchant.txt')
-rw-r--r-- | npc/001-1_Tulimshar/merchant.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/001-1_Tulimshar/merchant.txt b/npc/001-1_Tulimshar/merchant.txt index cd7ecd02..a664e74a 100644 --- a/npc/001-1_Tulimshar/merchant.txt +++ b/npc/001-1_Tulimshar/merchant.txt @@ -1,3 +1,3 @@ // -001-1.gat,39,52,0 shop Neko 101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000 +001-1.gat,39,52,0 shop Neko 101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000,735:-1 |