diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-09 11:42:31 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-09 11:42:31 -0700 |
commit | 9135c11fa303fd5c1eaa839be4199c234ef96bfe (patch) | |
tree | a5f23ce2c78b2a555aadfd9408f5ef2ce7a8e80f /ChangeLog | |
parent | 9ee357f34b9a63ef36e1c8e1f06526db0eda02c1 (diff) | |
parent | 332ce10139535723166b04b52ac6d34da7fefe94 (diff) | |
download | emacs-9135c11fa303fd5c1eaa839be4199c234ef96bfe.tar.gz |
Merge from mainline.
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ea5b106a895..b766dbed7dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ -2011-04-08 Paul Eggert <eggert@cs.ucla.edu> +2011-04-09 Paul Eggert <eggert@cs.ucla.edu> * lib/allocator.c: New file, automatically generated by gnulib. +2011-04-07 Glenn Morris <rgm@gnu.org> + + * autogen/update_autogen: Ignore comment diffs in ldefs-boot.el. + 2011-04-06 Eli Zaretskii <eliz@gnu.org> * lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS): |