Merge from emacs-23 branch, up to 2010-05-20T22:16:19Z!juri@jurta.org.

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 28ab200..b15d49f 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,6 +1,27 @@
+2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * notes/bzr (Installing changes from gnulib): New section.
+       Need for this suggested by Stefan Monnier.
+
+2011-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
+       an inconsistent state.
+
+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,
+       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-15  Glenn Morris  <rgm@gnu.org>
 
-       * charsets/eucjp-ms.awk: No longer print arch-tag.
+       * 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.