Mercurial > emacs
diff ChangeLog @ 112324:2b598aa5d397
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Thu, 13 Jan 2011 09:17:33 -0800 |
| parents | ecce7818cd6f c5917804ecad |
| children | ba9f26694b92 |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 11 22:13:06 2011 -0800 +++ b/ChangeLog Thu Jan 13 09:17:33 2011 -0800 @@ -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