1 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a473e65386..18e4b343fb7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * image.c: #undef COLOR_TABLE_SUPPORT when USE_CAIRO.
+        (x_clear_image): Free cr_data and cr_data2 if set.
+        (xpm_load): Assign data to cr_data2.
+        (svg_load_image): Convert from GdkPixbuf to CAIRO_FORMAT_ARGB32.
+
+        * dispextern.h (struct image): add cr_data2 if cairo.
+
 2015-04-03  Jan Djärv  <jan.h.d@swipnet.se>
 
         * image.c (prepare_image_for_display): Don't load if USE_CAIRO.