From 9ef634559f3cde232586b1dc6fd00bea3f3d8e53 Mon Sep 17 00:00:00 2001
From: ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 10 Jul 2011 06:17:06 +0000
Subject: * Merged changes from trunk [14827:14894/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14895 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 conf/Changelog.txt   | 2 ++
 conf/msg_athena.conf | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 85428aab0..5d33110b0 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2011/07/09
+	* Rev. 14892 Removed 'msg_athena.conf' messages 619 and 620 (duplicates to 572 and 573) (since r5506). [Ai4rei]
 2011/05/13
 	* Rev. 14812 Added settings 'cashshop_show_points' and 'mail_show_status', both disabled by default, as the messages they control are custom (follow up to r11548 and r12264). [Ai4rei]
 	- Moved custom cash point update messages to 'msg_athena.conf' (IDs 504~506).
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 47417632e..f6d696e27 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -529,8 +529,8 @@
 616: Taekwon
 617: Star Gladiator
 618: Soul Linker
-619: Gunslinger
-620: Ninja
+//619: FREE
+//620: FREE
 621: Summer
 //...
 625: Rune Knight
-- 
cgit v1.2.3-70-g09d2