summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-06-15 11:50:18 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-06-15 11:50:18 -0700
commit8c9b210626493dd93f236d7fb312c4f6dba62892 (patch)
treef7f0c345546eabd662d3ae855e1fbfc9a62bd43a /ChangeLog
parenteeafcea7ee4c253678e842342e0ea8ea0d442f30 (diff)
downloademacs-8c9b210626493dd93f236d7fb312c4f6dba62892.tar.gz
* lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: Merge from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cd73001d541..c6531ffba3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-15 Paul Eggert <eggert@cs.ucla.edu>
+
+ * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: Merge from gnulib.
+
2011-06-14 Jan Djärv <jan.h.d@swipnet.se>
* configure.in: Add emacsgtkfixed.o to GTK_OBJ if HAVE_GTK3.