Merge from emacs-24; up to 2012-12-29T12:57:49Z!fgallina@gnu.org

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2e4156c3c79f0fe96527e50a9669f4ea275c4875..bd938539421f6b5f08b1354e87641745637f83bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-03  Christoph Egger  <christoph@debian.org>  (tiny change)
+
+       * configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang.
+       http://bugs.debian.org/712974
+
 2013-07-02  Paul Eggert  <eggert@cs.ucla.edu>
 
        Remove some unused macros from 'configure'.