From 1f24fba0eafc5f5e13c4e27cc315ac13cd450bbc Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Tue, 10 Nov 2009 21:48:04 -0500
Subject: [PATCH] Preparation for 2.2.6

Updated NEWS and configure.in.
---
 NEWS         | 18 ++++++++++++++++++
 configure.in |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 9fd2b224..ca7acedd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+* gLabels 2.2.6 (stable) release.  Release date 2009-11-11
+
+- Fixed drawing artifact with round labels.
+- Fixed several memory issues.
+- Fixed several UI inconsistencies when changing merge source.
+- Fixed potiential crash when doing a document merge.
+- Now makes a better guess at locale defaults (page size and units).
+- Updated user documentation (Mario Blättermann).
+- Updated swedish translation (Daniel Nylander).
+- Updated german translation (Mario Blättermann).
+- Updated russian translation (Alexandre Prokoudine)
+- Updated french translation (Claude Paroz)
+- New chinese translation (Careon)
+- New catalan translation (David Planella)
+- Updated german translation of user documentation (Mario Blättermann).
+- New templates.
+
+
 * gLabels 2.2.5 (stable) release.  Release date 2009-04-30
 
 - Fixed spinbutton/adjustment bugs that made glabels unusable with Gtk 2.16.
diff --git a/configure.in b/configure.in
index ba945af0..12c9cd34 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.52)
 
-AC_INIT(glabels, 2.2.5, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
+AC_INIT(glabels, 2.2.6, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
 AC_CONFIG_SRCDIR(src/glabels.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 GNOME_DOC_INIT
-- 
2.39.5