From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 14 Jan 2011 05:07:26 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~234
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3720fa2b1ac94b8ac9f193264bcf36990a5f43d2;p=emacs.git

Merge from mainline.
---

3720fa2b1ac94b8ac9f193264bcf36990a5f43d2
diff --cc admin/ChangeLog
index 0e0d9f2e0d2,e0059664aba..e8b2d571ebd
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,14 -1,8 +1,19 @@@
- 2011-01-09  Paul Eggert  <eggert@cs.ucla.edu>
++2011-01-14  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,
 +	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-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