summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Piñeiro <apinheiro@igalia.com>2017-09-11 10:56:08 +0200
committerAlejandro Piñeiro <apinheiro@igalia.com>2017-09-11 10:56:08 +0200
commitd2fbf661260626939cc3186c58177c1890c0e2e2 (patch)
treee239f59bbb035de7cafc50b0e902b97852831436
parentb7c27035f49cdfe6cd1f71011b786002d4b8fc9b (diff)
downloadatk-d2fbf661260626939cc3186c58177c1890c0e2e2.tar.gz
Release 2.26.0ATK_2_26_0
-rw-r--r--NEWS14
-rw-r--r--configure.ac4
-rw-r--r--meson.build2
3 files changed, 17 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index c21607d..201d1bc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Changes in version 2.26
+=======================
+
+* Build: meson on Windows, tracked by Bug 785802 (not fully fixed yet):
+ * Force-include msvc_recommended_pragmas.h on MSVC
+ * tests: Fix build on pre-C99
+ * meson: Build .rc file on Windows
+
+Contributors
+ Chun-wei Fan
+
+Translations
+ Ask Hjorth Larsen (da)
+
Changes in version 2.25.90
==========================
diff --git a/configure.ac b/configure.ac
index 441c7b7..c6eebae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@ dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0.
dnl The triplet
m4_define([atk_major_version], [2])
-m4_define([atk_minor_version], [25])
-m4_define([atk_micro_version], [90])
+m4_define([atk_minor_version], [26])
+m4_define([atk_micro_version], [0])
m4_define([atk_version],
[atk_major_version.atk_minor_version.atk_micro_version])
diff --git a/meson.build b/meson.build
index 78dc45f..8751bd4 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('atk', 'c',
- version: '2.25.90',
+ version: '2.26.0',
license: 'LGPLv2.1+',
default_options: [
'buildtype=debugoptimized',