summaryrefslogtreecommitdiff
path: root/Changelog-Trunk.txt
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-13 22:44:01 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-13 22:44:01 +0000
commit4c5e3668433a0a6d63c0777f451f270f06e57fb7 (patch)
treeb0dd057ef28d2fc04bfe9700c613ef45dd38b4f5 /Changelog-Trunk.txt
parent938038f8e34ab93e1f38f1999534270238845194 (diff)
downloadhercules-4c5e3668433a0a6d63c0777f451f270f06e57fb7.tar.gz
hercules-4c5e3668433a0a6d63c0777f451f270f06e57fb7.tar.bz2
hercules-4c5e3668433a0a6d63c0777f451f270f06e57fb7.tar.xz
hercules-4c5e3668433a0a6d63c0777f451f270f06e57fb7.zip
* Merged changes up to eAthena 15033.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15098 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'Changelog-Trunk.txt')
-rw-r--r--Changelog-Trunk.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 82b4831c0..8dcbcaef7 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011-12-10
+ * Disabled creation of merceneries on TXT until charmerge is done, since the current char-server does not support it (bugreport:2502, since r13116). [Ai4rei]
* Updated pcre3.dll and related files from 7.0 to 8.20 (bugreport:4948). [Ai4rei]
2011-12-09
* Updated PACKETVER and packet_db_ver to the most recent fully supported and stable client (2010-07-28aRagexeRE). [Ai4rei]