diff options
| author | Paul Eggert | 2011-04-09 11:42:31 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-09 11:42:31 -0700 |
| commit | 762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a (patch) | |
| tree | 7b2fe40a89bf327ea8b9ad8265a6b6f27cacd2a7 /ChangeLog | |
| parent | eb3f1cc8dfe6a96505f1c5f9174b2712998cb52f (diff) | |
| parent | 8546720e6f25eb988e8215de6678798053031440 (diff) | |
| download | emacs-762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a.tar.gz emacs-762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a.zip | |
Merge from mainline.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
| @@ -1,7 +1,11 @@ | |||
| 1 | 2011-04-08 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-09 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * lib/allocator.c: New file, automatically generated by gnulib. | 3 | * lib/allocator.c: New file, automatically generated by gnulib. |
| 4 | 4 | ||
| 5 | 2011-04-07 Glenn Morris <rgm@gnu.org> | ||
| 6 | |||
| 7 | * autogen/update_autogen: Ignore comment diffs in ldefs-boot.el. | ||
| 8 | |||
| 5 | 2011-04-06 Eli Zaretskii <eliz@gnu.org> | 9 | 2011-04-06 Eli Zaretskii <eliz@gnu.org> |
| 6 | 10 | ||
| 7 | * lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS): | 11 | * lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS): |