Merge from origin/emacs-24

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 68a734135ac1a17ecccf22d4d0cf7aab832e89be..00a9d00a2bfc74a6f8135597b7a10eee35a8adee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * configure.ac (HAVE_W32): Abort with error message if
+       --without-toolkit-scroll-bars was specified.  See
+       http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00525.html
+       for the details.
+
 2015-01-27  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port autogen.sh hook creation to private templates