1 files changed, 8 insertions, 4 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 091732b40dd..6adc3f53c92 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -19,22 +19,26 @@
 
 2014-11-27  Oscar Fuentes  <ofv@wanadoo.es>
 
-        * admin/CPP-DEFINES: Mention MINGW_W64.
+        * CPP-DEFINES: Mention MINGW_W64.
 
 2014-11-22  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (set-version): No more need to update nt/*.rc.
         * authors.el (authors-renamed-files-alist): Add .rc.in files.
 
+2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * update_autogen: Merge from emacs-24 (restoring bzr conditionals).
+
 2014-11-13  Andreas Schwab  <schwab@suse.de>
 
         * make-tarball.txt: Make annotated tag and push it out.
 
 2014-11-11  Eric S. Raymond  <esr@thyrsus.com>
 
-        * make-tarball.txt, update-copyright, admin/notes/bugtracker,
-        admin/notes/tags, admin/update-copyright, admin/update_autogen:
-        admin/repo.notes: git transition.
+        * make-tarball.txt, update-copyright, notes/bugtracker, notes/tags:
+        * repo.notes: Git transition.
+        * update_autogen: Remove some bzr conditionals.
 
 2014-11-10  Eli Zaretskii  <eliz@gnu.org>