Merge branch 'master' into cairo

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b004a2bba966b1012140cae27247f55081747947..d7abeac9ba6c71c65127df83019ed2c788520ebf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1601,6 +1601,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):