aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-10-07 23:17:40 -0700
committerPaul Eggert2011-10-07 23:17:40 -0700
commitf7dfe84eeacb0316d2ceb8ed5fa59d50c4a7bdc8 (patch)
tree9422bfdf8ef7825621ef55e5464ec6a97d1f06db /ChangeLog
parent619e0f19b389388caa93b5f9b3966f79b0305a1b (diff)
parent61a57ef48995138f7b798d979ff189751f0acbfc (diff)
downloademacs-f7dfe84eeacb0316d2ceb8ed5fa59d50c4a7bdc8.tar.gz
emacs-f7dfe84eeacb0316d2ceb8ed5fa59d50c4a7bdc8.zip
Merge from trunk.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bdccef5941c..52aa133f8e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
12011-10-07 Paul Eggert <eggert@cs.ucla.edu> 12011-10-07 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Merge from gnulib, fixing some 'configure' typos (Bug#9696).
4 * lib/signal.in.h, lib/sigprocmask.c, m4/gl-comp.m4:
5 * m4/gnulib-common.m4: Merge from gnulib.
6 Without this, 'configure' would say "func_gl_gnulib_m4code_pathmax:
7 command not found" on powerpc-apple-darwin9.8.0.
8
3 * configure.in (GC_LISP_OBJECT_ALIGNMENT): Remove. 9 * configure.in (GC_LISP_OBJECT_ALIGNMENT): Remove.
4 This is now done by src/alloc.c. 10 This is now done by src/alloc.c.
5 11