Merge from origin/emacs-24

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c155708f1f4bb64d739362a3b80c652b50c7296b..a489ab9f9df75f14338f101796e31d1979c45824 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-23  Andreas Schwab  <schwab@suse.de>
+
+       * configure.ac: Fix jpeg version check to work with gcc >= 5.
+
 2015-03-21  Samer Masterson  <samer@samertm.com>
 
        * CONTRIBUTE (Test your changes.): New section.