X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/565c0ca57e89ab1a1b4c378c615a998eb8fc0f99..16fab14354e612a22b5dea21b4106555fb05f712:/admin/ChangeLog diff --git a/admin/ChangeLog b/admin/ChangeLog index d3bc51bd9f..6f2ac5d67d 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,103 @@ +2011-01-31 Paul Eggert + + 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 + + strftime: import from gnulib + * notes/copyright: strftime.c moved from src to lib. + +2011-01-25 Glenn Morris + + * bzrmerge.el (bzrmerge-skip-regexp): New variable. + (bzrmerge-missing): Use it. + +2011-01-19 Paul Eggert + + * make-tarball.txt: Suggest 'autoreconf -I m4 --force' + rather than doing rm and autoconf by hand. See + . + +2011-01-17 Paul Eggert + + * notes/bzr (Installing changes from gnulib): New section. + Need for this suggested by Stefan Monnier. + +2011-01-17 Stefan Monnier + + * bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in + an inconsistent state. + +2011-01-17 Paul Eggert + + 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 + + * 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 + + * admin.el (set-copyright): Also handle \year in refcards/*.tex. + +2011-01-14 Glenn Morris + + * bzrmerge.el: Require cl when compiling. + (bzrmerge-merges): Doc fix. + +2011-01-07 Paul Eggert + + * notes/copyright: There's only one install-sh, not two, so fix a + typo claiming that there's two. Add move-if-change to the list of + GPL files imported from gnulib. + +2011-01-07 Paul Eggert + + * notes/copyright: Report status more accurately for non-GPL files. + Report copyright status more accurately for mkinstalldirs, + configure, m4/getopt.m4, and msdos/sed*.inp. + +2011-01-02 Eli Zaretskii + + * nt/README.W32: Update the information about PNG support libraries. + (Bug#7716) + +2010-12-27 Stefan Monnier + + * bzrmerge.el: New file to help merge branches while skipping + some revisions (e.g. from emacs-23 to trunk). + +2010-12-03 Andreas Schwab + + * CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove. + +2010-10-12 Glenn Morris + + * notes/nextstep: Move here from ../nextstep/DEV-NOTES. + +2010-10-09 Glenn Morris + + * admin.el (set-version): Add doc/emacs/emacsver.texi. + +2010-10-09 Glenn Morris + + * admin.el (set-version): No need to act on doc/ files any more. + + * quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m. + 2010-09-05 Juanma Barranquero * unidata/BidiMirroring.txt: Update from @@ -949,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. @@ -969,5 +1067,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - -;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a