Move photo ID display code from epg.el to gnus/mml2015.el.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 9f56370..2e3c32d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-12-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       2012-12-21 AC_PROG_MKDIR_P: port workaround to pre-2.62 Autoconf
+       2012-12-20 AC_PROG_MKDIR_P: don't workaround if not buggy
+       2012-12-17 filemode, sys_stat: Handle MPX files a la AIX.
+
+2012-12-21  Akinori MUSHA  <knu@iDaemons.org>  (tiny change)
+
+       * Makefile.in (install-arch-dep): Ignore chmod errors.  (Bug#13233)
+
 2012-12-16  Romain Francoise  <romain@orebokech.com>
 
        * configure.ac (acl): New option.