aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2014-02-23 23:12:42 -0800
committerPaul Eggert2014-02-23 23:12:42 -0800
commitf1037d0b8b95cf2afcbacededaae1627b3cb22f1 (patch)
tree7c53e9d94a127a52be32386e81c8295a700eb63d /ChangeLog
parent8ee4c296ecae9e354bc743fad0fd7f5a5e49e1a2 (diff)
downloademacs-f1037d0b8b95cf2afcbacededaae1627b3cb22f1.tar.gz
emacs-f1037d0b8b95cf2afcbacededaae1627b3cb22f1.zip
Merge from gnulib.
2014-02-21 timer: fix uClibc detection of threading 2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf * texinfo.tex: Update from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4cefaef325f..92254afce31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12014-02-24 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2014-02-21 timer: fix uClibc detection of threading
5 2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf
6
12014-02-18 Mirek Kaim <mirek.kaim@outlook.com> (tiny change) 72014-02-18 Mirek Kaim <mirek.kaim@outlook.com> (tiny change)
2 8
3 * configure.ac [HAVE_W32]: Test for ImageMagick. (Bug#16754) 9 * configure.ac [HAVE_W32]: Test for ImageMagick. (Bug#16754)