Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2189fac6a05fcf63c937ec54bb2227f7bd38c44f..9c2582cb0f456343cbea3e0efb91de823f590a60 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-08  Leo Liu  <sdl.web@gmail.com>
+
+       * themes/deeper-blue-theme.el: Use another fix.  (Bug#17695)
+
 2014-06-08  Juri Linkov  <juri@jurta.org>
 
        * themes/deeper-blue-theme.el (diff-added, diff-changed, diff-removed):