aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2014-02-05 11:41:03 -0800
committerPaul Eggert2014-02-05 11:41:03 -0800
commit06c2ec49462474205dbd79a5dbd96bf73367d949 (patch)
tree90a5090472895f15ff1fa9aa0bbe475a914b180c /ChangeLog
parent81f9a6edde971d8ec7d31cab03a766feb6ae074b (diff)
downloademacs-06c2ec49462474205dbd79a5dbd96bf73367d949.tar.gz
emacs-06c2ec49462474205dbd79a5dbd96bf73367d949.zip
Merge from gnulib.
This incorporates: 2014-01-23 pthread: work around winpthread header pollution on mingw * lib/time.in.h: Update from gnulib. * doc/misc/texinfo.tex: Update from texinfo.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a00981c219e..67d32962001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12014-02-05 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2014-01-23 pthread: work around winpthread header pollution on mingw
5 * lib/time.in.h: Update from gnulib.
6
12014-01-23 Paul Eggert <eggert@cs.ucla.edu> 72014-01-23 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 Merge from gnulib, incorporating: 9 Merge from gnulib, incorporating: