Mercurial > emacs
diff admin/ChangeLog @ 112326:63e39d23b102
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Thu, 13 Jan 2011 21:07:26 -0800 |
| parents | a4a6f5f8f078 1fd3710e6845 |
| children | 17e0028efc29 |
line wrap: on
line diff
--- a/admin/ChangeLog Thu Jan 13 16:33:24 2011 -0800 +++ b/admin/ChangeLog Thu Jan 13 21:07:26 2011 -0800 @@ -1,4 +1,4 @@ -2011-01-09 Paul Eggert <eggert@cs.ucla.edu> +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, @@ -9,6 +9,11 @@ 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> + + * bzrmerge.el: Require cl when compiling. + (bzrmerge-merges): Doc fix. + 2011-01-07 Paul Eggert <eggert@cs.ucla.edu> * notes/copyright: There's only one install-sh, not two, so fix a @@ -1000,7 +1005,6 @@ ;; Local Variables: ;; coding: utf-8 -;; add-log-time-zone-rule: t ;; End: Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, @@ -1020,5 +1024,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - -;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a