From: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Mon, 11 Sep 2017 08:56:08 +0000 (+0200)
Subject: Release 2.26.0
X-Git-Tag: upstream/2.28.1~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2fbf661260626939cc3186c58177c1890c0e2e2;p=platform%2Fupstream%2Fatk.git

Release 2.26.0
---

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',