From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Oct 2014 01:47:48 +0000 (-0700)
Subject: Merge from emacs-24; up to 2014-07-26T12:14:42Z!schwab@linux-m68k.org
X-Git-Tag: emacs-25.0.90~2635^2~679^2~68
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7410c4e8720ff62f69e5032f1c2fd0325fb8457a;p=emacs.git

Merge from emacs-24; up to 2014-07-26T12:14:42Z!schwab@linux-m68k.org
---

7410c4e8720ff62f69e5032f1c2fd0325fb8457a
diff --cc doc/emacs/ChangeLog
index b1be1416a77,1626a156ea1..23e1d0dff76
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,9 -1,8 +1,13 @@@
+ 2014-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* Makefile.in (dist): Update for new output variables.
+ 
 -2014-10-06  Glenn Morris  <rgm@gnu.org>
 +2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* macos.texi (Mac OS / GNUstep, Mac / GNUstep Basics)
 +	(Mac / GNUstep Customization): Mac OS X 10.6 or later now required.
 +
 +2014-10-09  Glenn Morris  <rgm@gnu.org>
  
  	* package.texi (Package Menu): The package list was changed to not
  	say "unsigned" any more.
diff --cc doc/lispintro/ChangeLog
index 70d7767635f,72c6023bba7..6ccac447134
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
+ 2014-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* Makefile.in (dist): Update for new output variables.
+ 
 -2014-07-15  Álvar Jesús Ibeas Martín  <alvar.ibeas@unican.es>  (tiny change)
 +2014-07-16  Álvar Jesús Ibeas Martín  <alvar.ibeas@unican.es>  (tiny change)
  
  	* emacs-lisp-intro.texi (Variables, Buffer Names, if & or)
  	(Symbols as Chest, fwd-para while): Fix typos.
diff --cc doc/lispref/ChangeLog
index 8ec524cc534,272f21f4570..3955bd09b38
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
+ 2014-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* Makefile.in (dist): Update for new output variables.
+ 
 -2014-10-09  Glenn Morris  <rgm@gnu.org>
 +2014-10-12  Glenn Morris  <rgm@gnu.org>
  
  	* elisp.texi (DATE): Bump to October 2014.
  
diff --cc doc/misc/ChangeLog
index 70207de3b3b,f4291479ce1..23c3e66b86f
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
+ 2014-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* Makefile.in (dist): Update for new output variables.
+ 
 +2014-10-08  Leo Liu  <sdl.web@gmail.com>
 +
 +	* cl.texi (Porting Common Lisp): Remove parse-integer.
 +
 +2014-10-06  Ulf Jasper  <ulf.jasper@web.de>
 +
 +	* newsticker.texi (Supported Formats): Fix order of subheading and
 +	itemize.
 +
  2014-10-04  Glenn Morris  <rgm@gnu.org>
  
  	* vip.texi (Other Vi Commands): Markup fix.