* lisp/emacs-lisp/gulp.el (gulp-discard): Add emacs-devel.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 54f2d17..67d3296 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2014-02-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       2014-01-23 pthread: work around winpthread header pollution on mingw
+       * lib/time.in.h: Update from gnulib.
+
+2014-01-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       2014-01-22 qacl: check for fchmod
+       * m4/acl.m4: Update from gnulib.
+
+2014-01-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix miscellaneous update-game-score bugs.
+       * configure.ac (difftime): Remove.
+
 2014-01-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:
@@ -102,7 +119,6 @@
        * build-aux/update-copyright: New file.
        * make-dist: Distribute it.
        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
-       * msdos/autogen/Makefile.in: Update copyright year.
 
 2013-12-23  Andreas Schwab  <schwab@linux-m68k.org>