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

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0e0d9f2..6f2ac5d 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,4 +1,37 @@
-2011-01-09  Paul Eggert  <eggert@cs.ucla.edu>
+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
+       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,
@@ -9,6 +42,22 @@
        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/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.
+
+2011-01-14  Glenn Morris  <rgm@gnu.org>
+
+       * admin.el (set-copyright): Also handle \year in refcards/*.tex.
+
+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,11 +1049,9 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-       2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -1020,5 +1067,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