merge trunk

1 files changed, 29 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b6e368ec75..5657f8bb3aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2012-08-22  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (install-arch-dep): If NO_BIN_LINK is non-null,
+        do not create the bin/emacs link.  (Bug#12011)
+
+2012-08-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2012-08-20 extern-inline: support old GCC 'inline'
+
+2012-08-20  Glenn Morris  <rgm@gnu.org>
+
+        * configure.ac (AC_PROG_LN_S): Test for ln.
+        * Makefile.in (LN_S): New, set by configure.
+        (install-arch-dep): Use $LN_S.
+
+2012-08-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2012-08-19 ignore-value, stat-time, timespec: omit AC_C_INLINE
+        2012-08-19 mktime, sys_select: avoid 'static inline'
+        2012-08-19 gnulib-tool: Fix indentation.
+
+2012-08-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lib/sigprocmask.c, m4/signalblocking.m4: Remove.
+        These files have been unused since the 2012-06-22 patch that
+        introduced high-resolution time stamps.
+
 2012-08-17  Jan Beich  <jbeich@tormail.org>  (tiny change)
 
         * configure.ac (PTY_OPEN): Try posix_openpt on gnu-linux,