* automated/tramp-tests.el (tramp-test26-process-file): Improve test.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a00981c..67d3296 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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: