summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2018-04-07 13:30:16 -0400
committerMatthias Clasen <mclasen@redhat.com>2018-04-07 13:30:33 -0400
commit12aa6f9264514c62781124a7287c2e997d3ea482 (patch)
tree95f73262e54ef2c33b600a02e57e590897b3d892
parent24ecd7247425acae016b68c1f6229206bd19dc84 (diff)
downloadgdk-pixbuf-2-36.tar.gz
-rw-r--r--NEWS9
-rw-r--r--configure.ac2
-rw-r--r--meson.build2
3 files changed, 11 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 5af0bfc63..4c79dbe2e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+2.36.12
+=======
+* build: meson fixes for win32
+* build: Make --without-libtiff work
+* build: Make x11 support optional
+* gif, ico, jpeg, tiff, icns: various fixes (#778584, #779012, #753605, #779020, #779016)
+* Implement async loading without threads
+* Translation updates
+
2.36.11
=======
* build: Fix tiff loader build (#786342)
diff --git a/configure.ac b/configure.ac
index 9f5d6fbee..b1c45725c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_PREREQ([2.63])
m4_define([gdk_pixbuf_major_version], [2])
m4_define([gdk_pixbuf_minor_version], [36])
-m4_define([gdk_pixbuf_micro_version], [11])
+m4_define([gdk_pixbuf_micro_version], [12])
m4_define([gdk_pixbuf_interface_age], [0])
m4_define([gdk_pixbuf_binary_age],
[m4_eval(100 * gdk_pixbuf_minor_version + gdk_pixbuf_micro_version)])
diff --git a/meson.build b/meson.build
index 185ea6a26..13a1e9735 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('gdk-pixbuf', 'c',
- version: '2.36.11',
+ version: '2.36.12',
license: 'LGPLv2.1+',
default_options: [
'buildtype=debugoptimized',