From c5ee728c20b2d04aa69f21feefcbdd8c6ca0ba36 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= <apinheiro@igalia.com>
Date: Wed, 9 Aug 2017 09:10:30 +0200
Subject: [PATCH] Release 2.25.90

---
 NEWS         | 25 +++++++++++++++++++++++++
 configure.ac |  2 +-
 meson.build  |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index ae66228..c21607d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,28 @@
+Changes in version 2.25.90
+==========================
+
+* Bugfixing
+   * 689810: Move include guards out to enable GCC optimisation
+* Build (meson)
+   * Keep the version in sync with Autotools
+   * Add atkversion.h to introspection build
+* Build (visual studio)
+   * Adapt to the Python-field glib-genmarshal
+   * Adapt to new glib-genmarshal command line
+   * Use PythonDir instead of PythonPath
+   * Integrate introspection builds
+   * Don't build introspection by default
+   * Make marshal generation more robust
+* Misc
+   * Update AUTHORS file
+
+Contributors
+  Emmanuele Bassi, Daniel Boles, Chun-wei Fan, Rico Tzschichholz
+
+Translations
+  Pawan Chitrakar (ne), Fabio Tomat (fur)
+
+
 Changes in version 2.25.2
 =========================
 
diff --git a/configure.ac b/configure.ac
index 1d54126..441c7b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ 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], [2])
+m4_define([atk_micro_version], [90])
 m4_define([atk_version],
           [atk_major_version.atk_minor_version.atk_micro_version])
 
diff --git a/meson.build b/meson.build
index 2e558b4..44806d0 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('atk', 'c',
-        version: '2.25.2',
+        version: '2.25.90',
         license: 'LGPLv2.1+',
         default_options: [
           'buildtype=debugoptimized',
-- 
2.7.4