aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-02-24 23:36:37 -0800
committerPaul Eggert2011-02-24 23:36:37 -0800
commit4394ee04741d5fe2fd4cc7a7ee821e1f8a3f2d32 (patch)
tree01adeba52c6e9028a694fc75cdc3f17b5c0a77fd /ChangeLog
parenta07b892ff17e95e513c4bfe6e2dd73df1e589bf3 (diff)
parent9411886d3818d55e86eb1002ed39b38ce2426c63 (diff)
downloademacs-4394ee04741d5fe2fd4cc7a7ee821e1f8a3f2d32.tar.gz
emacs-4394ee04741d5fe2fd4cc7a7ee821e1f8a3f2d32.zip
Merge from mainline.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 67a29aa7e12..d79576e3ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12011-02-25 Paul Eggert <eggert@cs.ucla.edu>
2
3 * configure, lib/Makefile.in, lib/getopt_int.h, lib/gnulib.mk:
4 * lib/stdlib.in.h, m4/stdlib_h.m4: Regenerate.
5
12011-02-24 Glenn Morris <rgm@gnu.org> 62011-02-24 Glenn Morris <rgm@gnu.org>
2 7
3 * configure.in: Replace obsolete AC_OUTPUT() with AC_CONFIG_FILES(), 8 * configure.in: Replace obsolete AC_OUTPUT() with AC_CONFIG_FILES(),