diff options
| author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
| commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
| tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /npc/re/merchants/diamond.txt | |
| parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
| parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
| download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/re/merchants/diamond.txt')
| -rw-r--r-- | npc/re/merchants/diamond.txt | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt index fa19f372d..43d565188 100644 --- a/npc/re/merchants/diamond.txt +++ b/npc/re/merchants/diamond.txt @@ -4,18 +4,16 @@ //= Z3R0 //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= 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) +//= 1.0 First / Optimized Version +//= 1.1 Adjusted for Missing ; on Line #271 (#15425) +//= 1.2 Removed Comments per Request (#15426) +//= 1.3 Changed Emotion # to Const Definition (#15427) +//= 1.4 Removed Double Space on Line #148 (#15428) +//= 1.5 Added This Version History (#15429) //============================================================ - script RareDiamondMerchant 58,{ |