merge trunk

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0621a8..b2cc65a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-07  Kenichi Handa  <handa@gnu.org>
+
+       * international/mule-conf.el (compound-text-with-extensions): Add
+       :mime-charset property as x-ctext.
+
 2012-10-07  Stefan Merten  <smerten@oekonux.de>
 
        * textmodes/rst.el (rst-new-adornment-down, rst-indent-field)