Merge from mainline.

1 files changed, 29 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a1a82f6c3b..bc70b1e4446 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2013-07-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * INSTALL (DETAILED BUILDING AND INSTALLATION): Add
+        --without-file-notification to --without-all.
+
+2013-07-29  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * INSTALL: Fix description.
+
+2013-07-27  Glenn Morris  <rgm@gnu.org>
+
+        * configure.ac: Extend the --with-sound option to allow
+        specification of OSS or ALSA (see bug#14812#64).
+
+2013-07-25  Glenn Morris  <rgm@gnu.org>
+
+        * info/dir: Add ido.
+
+        * make-dist: Add a --tests option, to include test/.
+
 2013-07-24  Glenn Morris  <rgm@gnu.org>
 
         * configure.ac: Use self-descriptive tags for AC_CONFIG_COMMANDS.
@@ -55,7 +75,7 @@
         * lib/ignore-value.h: Remove this gnulib-imported file.
         * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
 
-2013-07-08  Magnus Henoch <magnus.henoch@gmail.com> (tiny change)
+2013-07-08  Magnus Henoch  <magnus.henoch@gmail.com>  (tiny change)
 
         * configure.ac (HAVE_IMAGEMAGICK): Check on NS also (Bug#14798).
 
@@ -2021,7 +2041,7 @@
         * Makefile.in (install-arch-indep, install-doc, install-info)
         (uninstall): Scrap superfluous subshells.
 
-2012-05-19  Ulrich Mueller  <ulm@gentoo.org>
+2012-05-19  Ulrich Müller  <ulm@gentoo.org>
 
         * Makefile.in (install-etc): Respect DESTDIR.  (Bug#11518)
 
@@ -3797,7 +3817,7 @@
         * Makefile.in (install-arch-indep, info):
         Replace MAKEINFO = off with HAVE_MAKEINFO = no.
 
-2010-12-29  Ulrich Mueller  <ulm@gentoo.org>
+2010-12-29  Ulrich Müller  <ulm@gentoo.org>
 
         * configure.in: Make gameuser configurable (Bug#7717).
 
@@ -5007,7 +5027,7 @@
 
         * info/dir: Untabify.
 
-2008-11-28  Ulrich Mueller  <ulm@gentoo.org>
+2008-11-28  Ulrich Müller  <ulm@gentoo.org>
 
         * configure.in: Fix last change.
 
@@ -5070,7 +5090,7 @@
         * configure (*-sunos5*, *-solaris*): Use the new file sol2-10.h.
         Use sol2-6.h for Solaris 7-9.
 
-2008-10-18  Ulrich Mueller  <ulm@gentoo.org>
+2008-10-18  Ulrich Müller  <ulm@gentoo.org>
 
         * configure.in: Add support for GNU/Linux on SuperH.
 
@@ -5154,7 +5174,7 @@
 
         * configure.in (COCOA_EXPERIMENTAL_CTRL_G): Fix 2008-08-04 change.
 
-2008-08-05  Ulrich Mueller  <ulm@gentoo.org>
+2008-08-05  Ulrich Müller  <ulm@gentoo.org>
 
         * configure.in: Add checks for krb5_error.text and
         krb5_error.e_text struct members.
@@ -5522,7 +5542,7 @@
         * configure.in (--with-gcc): Remove.
         * INSTALL (DETAILED BUILDING AND INSTALLATION): Remove --with-gcc.
 
-2008-02-05  Ulrich Mueller  <ulm@gentoo.org>
+2008-02-05  Ulrich Müller  <ulm@gentoo.org>
 
         * INSTALL: Recommend giflib, not libungif.
 
@@ -5544,7 +5564,7 @@
         * configure.in: For libotf and m17n-flt checks, set shell vars
         HAVE_LIBOTF and HAVE_M17N_FLT instead of pkg_check_libotf and
         pkg_check_m17n_flt, respectively, for the sake of the summary output.
-        Reported by Ulrich Mueller.
+        Reported by Ulrich Müller.
 
 2008-02-02  Eli Zaretskii  <eliz@gnu.org>
 
@@ -5858,7 +5878,7 @@
 
         * configure.in: Put quotes around nested macro calls.
 
-2007-08-31  Ulrich Mueller  <ulm@gentoo.org>  (tiny change)
+2007-08-31  Ulrich Müller  <ulm@gentoo.org>  (tiny change)
 
         * configure.in: Fix typo.
         * configure: Regenerate.