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 ca310c1..b15d49f 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,13 @@
+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.