Merge branch 'master' into cairo

[gnu-emacs] / lwlib / ChangeLog

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index e5dfed2342abc13135860ab3f87c6fd2fc895bdd..2e317dd2f667da20e07f878a228027e50f5cdd3d 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,6 @@
+2015-04-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * Makefile.in (CAIRO_CFLAGS): Add.
 2015-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * xlwmenu.c (pop_up_menu): Remove debugging code.