From 1018e671c083285bb926fd22cca727afd8bcbc7c Mon Sep 17 00:00:00 2001
From: script-z3r0 <script-z3r0@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 11 Jan 2012 22:01:06 +0000
Subject: Added Version History

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15429 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/merchants/diamond.txt | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'npc/merchants/diamond.txt')

diff --git a/npc/merchants/diamond.txt b/npc/merchants/diamond.txt
index 6c1440c84..4da143470 100644
--- a/npc/merchants/diamond.txt
+++ b/npc/merchants/diamond.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Z3R0
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.5
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,11 @@
 //= Exchanges 17 Carat Diamond
 //===== Additional Comments: ================================= 
 //= v1.0 First / Optimized Version
+//= v1.1 Adjusted for Missing ; on Line #271 (#15425)
+//= v1.2 Removed Comments per Request (#15426)
+//= v1.3 Changed Emotion # to Const Definition (#15427)
+//= v1.4 Removed Double Space on Line #148 (#15428)
+//= v1.5 Added This Version History (#15429)
 //============================================================ 
 
 prontera,165,89,6	script	Rare Diamond Merchant#1	58,{
@@ -248,9 +253,9 @@ prontera,165,89,6	script	Rare Diamond Merchant#1	58,{
 	}
 }
 
-geffen,106,63,6	duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#2	58
-morocc,146,100,6	duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#3	58
-alberta,129,60,6	duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#4	58
+geffen,106,63,6			duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#2	58
+morocc,146,100,6		duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#3	58
+alberta,129,60,6			duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#4	58
 lighthalzen,163,65,6	duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#5	58
-rachel,106,142,6	duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#6	58
-payon,180,130,6	duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#7	58
+rachel,106,142,6			duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#6	58
+payon,180,130,6			duplicate(Rare Diamond Merchant#1)	Rare Diamond Merchant#7	58
-- 
cgit v1.2.3-70-g09d2