Mercurial > emacs

comparison admin/ChangeLog @ 112326:63e39d23b102

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Thu, 13 Jan 2011 21:07:26 -0800
parents a4a6f5f8f078 1fd3710e6845
children 17e0028efc29
comparison
equal deleted inserted replaced
112325:36329d05ddec 112326:63e39d23b102
1 2011-01-09 Paul Eggert <eggert@cs.ucla.edu> 1 2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Update copyright notes to match recent gnulib-related changes. 3 Update copyright notes to match recent gnulib-related changes.
4 * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in, 4 * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
5 arg-nonnull.h, c++defs.h, compile, depcomp, missing, 5 arg-nonnull.h, c++defs.h, compile, depcomp, missing,
6 warn-on-use.h, lib/*.[ch], lib/gnulib.mk. Remove src/mktime.c, 6 warn-on-use.h, lib/*.[ch], lib/gnulib.mk. Remove src/mktime.c,
7 lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and 7 lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and
8 are subsumed by the lib/*.[ch] rule). Remove m4/getopt.m4 (now 8 are subsumed by the lib/*.[ch] rule). Remove m4/getopt.m4 (now
9 subsumed by m4/*.m4 rule). config.guess, config.sub, and 9 subsumed by m4/*.m4 rule). config.guess, config.sub, and
10 doc/man/texinfo.tex are now copied in from gnulib. 10 doc/man/texinfo.tex are now copied in from gnulib.
11 11
12 2011-01-14 Glenn Morris <rgm@gnu.org>
13
14 * bzrmerge.el: Require cl when compiling.
15 (bzrmerge-merges): Doc fix.
16
12 2011-01-07 Paul Eggert <eggert@cs.ucla.edu> 17 2011-01-07 Paul Eggert <eggert@cs.ucla.edu>
13 18
14 * notes/copyright: There's only one install-sh, not two, so fix a 19 * notes/copyright: There's only one install-sh, not two, so fix a
15 typo claiming that there's two. Add move-if-change to the list of 20 typo claiming that there's two. Add move-if-change to the list of
16 GPL files imported from gnulib. 21 GPL files imported from gnulib.
998 GETTING.GNU.SOFTWARE. Remove outdated comments. Explain about 1003 GETTING.GNU.SOFTWARE. Remove outdated comments. Explain about
999 version of tar used. 1004 version of tar used.
1000 1005
1001 ;; Local Variables: 1006 ;; Local Variables:
1002 ;; coding: utf-8 1007 ;; coding: utf-8
1003 ;; add-log-time-zone-rule: t
1004 ;; End: 1008 ;; End:
1005 1009
1006 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 1010 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
1007 2008, 2009, 2010 Free Software Foundation, Inc. 1011 2008, 2009, 2010 Free Software Foundation, Inc.
1008 1012
1018 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 1022 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1019 GNU General Public License for more details. 1023 GNU General Public License for more details.
1020 1024
1021 You should have received a copy of the GNU General Public License 1025 You should have received a copy of the GNU General Public License
1022 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 1026 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
1023
1024 ;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a