Merge branch 'master' into cairo

[gnu-emacs] / lisp / ChangeLog.17

diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index a40f8f3d67ac1b9870b51330e1292823a3912bd0..2408ad2d83227e672c087a4d88cc06bfec8fcd1c 100644 (file)
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -1748,6 +1748,12 @@
        (package-menu--print-info, package-menu--status-predicate):
        Account for the "incompat" status.
 
+2015-02-11  Martin Rudalics  <rudalics@gmx.at>
+
+2015-02-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * version.el (emacs-version): Add cairo version.
+
 2015-02-11  Martin Rudalics  <rudalics@gmx.at>
 
        * frame.el (toggle-frame-maximized, toggle-frame-fullscreen):