X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d67d60a2eab5f7f1f9b1d31cd1c7dd1e31bb4d2b..0d181095652bf8e1ca27935e54ecbb5443496334:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0a6b4f9b8d..f8e98bdf31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from gnulib, incorporating:
+	2014-03-04 stdint: fix missing SIZE_MAX on Android
+	2013-03-02 sys_types: avoid autoconf warning about gl_SYS_TYPES_H
+	* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+	* lib/stdint.in.h, lib/sys_types.in.h, m4/sys_types_h.m4:
+	Update from gnulib.
+
 2014-03-05  Glenn Morris  <rgm@gnu.org>
 
 	* configure.ac: Tweak the "unported" error message.