diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-13 09:17:33 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-13 09:17:33 -0800 |
| commit | 193770eec942defa96c7ea310773b40534f709d1 (patch) | |
| tree | 3a1ed2de2b7ece4697999045da27e21fb174f21c /ChangeLog | |
| parent | f737437b23c75bb6924021df14b4f740ce370b21 (diff) | |
| parent | 821f936d1c04df2f9ccaf6307b220d7cbe0e76c7 (diff) | |
| download | emacs-193770eec942defa96c7ea310773b40534f709d1.tar.gz | |
Merge from mainline.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 54b6958607e..789d54cfa60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2011-01-11 Paul Eggert <eggert@cs.ucla.edu> +2011-01-13 Paul Eggert <eggert@cs.ucla.edu> * Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr. This avoids building ftoastr and ldtoastr, which aren't needed. See @@ -106,6 +106,15 @@ * make-dist: Also put into the distribution aclocal.m4, compile, depcomp, missing, and the files under lib/. +2011-01-13 Christian Ohler <ohler@gnu.org> + + * Makefile.in (INFO_FILES): Add ERT. + + * Makefile.in (check): Run tests in test/automated. + + * Makefile.in: + * configure.in: Add test/automated/Makefile. + 2011-01-07 Paul Eggert <eggert@cs.ucla.edu> * install-sh, mkinstalldirs, move-if-change: Update from master |