Mercurial > emacs
diff admin/ChangeLog @ 112330:56d3e9c28eb0
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:01:01 -0800 |
| parents | 17e0028efc29 ef4120c8640c |
| children | 7e5855ddf3f2 |
line wrap: on
line diff
--- a/admin/ChangeLog Sun Jan 16 18:35:15 2011 -0800 +++ b/admin/ChangeLog Mon Jan 17 11:01:01 2011 -0800 @@ -1,4 +1,4 @@ -2011-01-14 Paul Eggert <eggert@cs.ucla.edu> +2011-01-17 Paul Eggert <eggert@cs.ucla.edu> Update copyright notes to match recent gnulib-related changes. * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in, @@ -9,6 +9,13 @@ subsumed by m4/*.m4 rule). config.guess, config.sub, and doc/man/texinfo.tex are now copied in from gnulib. +2011-01-15 Glenn Morris <rgm@gnu.org> + + * charsets/cp51932.awk, charsets/eucjp-ms.awk: No longer print arch-tag. + + * bzrmerge.el (bzrmerge-missing): Add another skip indicator. + (bzrmerge-resolve): Also ignore cl-loaddefs.el. + 2011-01-14 Glenn Morris <rgm@gnu.org> * admin.el (set-copyright): Also handle \year in refcards/*.tex.