summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-07-09 07:00:53 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-07-09 07:00:53 +0000
commit912dfc3af719b251d8a5036e76fb2733dddad46c (patch)
tree27d0f57bdb92b7e39c5a1a384f65d53a89b5754d /conf
parent88be51e8cb18a704152b76b98d49a2bda6fff0a9 (diff)
downloadhercules-912dfc3af719b251d8a5036e76fb2733dddad46c.tar.gz
hercules-912dfc3af719b251d8a5036e76fb2733dddad46c.tar.bz2
hercules-912dfc3af719b251d8a5036e76fb2733dddad46c.tar.xz
hercules-912dfc3af719b251d8a5036e76fb2733dddad46c.zip
* Removed duplicate entries for Gunslinger and Ninja in msg_athena.conf (since r5506).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14892 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
-rw-r--r--conf/Changelog.txt2
-rw-r--r--conf/msg_athena.conf4
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 71e3b75ca..1b4b45f05 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 98c20c361..ce02dfb30 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
//...
650: Unknown Job