src/emacs.c now gets version number from configure.in

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6a69872..6f2ac5d 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,31 @@
+2011-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+       src/emacs.c now gets version number from configure.in
+       * admin.el (set-version): Don't update src/emacs.c.
+       * quick-install-emacs (VERSION): Get it from configure.in, not from
+       src/emacs.c.
+
+2011-01-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       strftime: import from gnulib
+       * notes/copyright: strftime.c moved from src to lib.
+
+2011-01-25  Glenn Morris  <rgm@gnu.org>
+
+       * bzrmerge.el (bzrmerge-skip-regexp): New variable.
+       (bzrmerge-missing): Use it.
+
+2011-01-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * make-tarball.txt: Suggest 'autoreconf -I m4 --force'
+       rather than doing rm and autoconf by hand.  See
+       <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>.
+
+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
@@ -1023,8 +1051,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-    2010, 2011  Free Software Foundation, Inc.
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.