From: Paul Eggert <eggert@cs.ucla.edu> Date: Fri, 14 Jan 2011 18:14:17 +0000 (-0800) Subject: Merge from mainline. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~233 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d;p=emacs.git Merge from mainline. --- 8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d diff --cc admin/ChangeLog index e8b2d571ebd,5807863a910..5b714193ab1 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,14 -1,7 +1,18 @@@ +2011-01-14 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, + arg-nonnull.h, c++defs.h, compile, depcomp, missing, + warn-on-use.h, lib/*.[ch], lib/gnulib.mk. Remove src/mktime.c, + lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and + are subsumed by the lib/*.[ch] rule). Remove m4/getopt.m4 (now + subsumed by m4/*.m4 rule). config.guess, config.sub, and + doc/man/texinfo.tex are now copied in from gnulib. + + 2011-01-14 Glenn Morris <rgm@gnu.org> + + * admin.el (set-copyright): Also handle \year in refcards/*.tex. + 2011-01-14 Glenn Morris <rgm@gnu.org> * bzrmerge.el: Require cl when compiling.