summaryrefslogtreecommitdiff
path: root/conf/Changelog.txt
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-15 05:30:25 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-15 05:30:25 +0000
commita7c1a55bb6f3c3236ba02722e948a52c645a4918 (patch)
tree15c41cc68bb37051f7fb94bac03055875e25fe5d /conf/Changelog.txt
parentec4acd7b1d7f180af5929239ef0706d98d4b6bfc (diff)
downloadhercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.gz
hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.bz2
hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.tar.xz
hercules-a7c1a55bb6f3c3236ba02722e948a52c645a4918.zip
* Merged changes from trunk [14784:14819/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14821 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf/Changelog.txt')
-rw-r--r--conf/Changelog.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index a890c1252..85428aab0 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
+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).
2011/03/15
* Rev. 14744 Fixed option 'monster_ai' referring to setting 'mob_npc_warp' rather than 'mob_warp' (follow up to r8135). [Ai4rei]
2011/03/06