aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-09-26 14:34:22 -0700
committerPaul Eggert2011-09-26 14:34:22 -0700
commit6d69f077f1c4fac9c4562df816d7b711334d14c2 (patch)
treef1978dae5aa81e26e0ea6daad08a85dc047ff361 /ChangeLog
parent316f8af0092ff66f564fd3052d2e35baa9a5817f (diff)
parent04d51ad41a26fe75b239d29fc71965fe39799954 (diff)
downloademacs-6d69f077f1c4fac9c4562df816d7b711334d14c2.tar.gz
emacs-6d69f077f1c4fac9c4562df816d7b711334d14c2.zip
Merge from trunk.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 63b0097856f..a80fa24c3c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 * m4/stdint.m4, m4/stdio_h.m4, m4/sys_stat_h.m4, m4/time_h.m4: 15 * m4/stdint.m4, m4/stdio_h.m4, m4/sys_stat_h.m4, m4/time_h.m4:
16 * m4/unistd_h.m4: Merge from gnulib. 16 * m4/unistd_h.m4: Merge from gnulib.
17 17
182011-09-26 Andreas Schwab <schwab@linux-m68k.org>
19
20 * configure.in: Initialize HAVE_LIBXML2.
21
182011-09-26 Glenn Morris <rgm@gnu.org> 222011-09-26 Glenn Morris <rgm@gnu.org>
19 23
20 * make-dist: Add lib/makefile.w32-in. 24 * make-dist: Add lib/makefile.w32-in.