From dd87d6f42942feaa895253b5f1c8b2c8a495b0bd Mon Sep 17 00:00:00 2001
From: Nils Kneuper <crazy-ivanovic@gmx.net>
Date: Sun, 15 Mar 2009 23:37:14 +0000
Subject: [PATCH] post release version bump to 1.5.14+svn

took over the changelog entry for the max map size in the editor, too
---
 changelog         | 6 ++++++
 configure.ac      | 2 +-
 players_changelog | 6 +++++-
 src/wesconfig.h   | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index fc8be3dafc6..5e61a685b4b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+Version 1.5.14+svn:
+ * Language and i18n:
+   * updated translations:
+ * WML Engine:
+   * Increase the map size limit to 1000 by 1000
+
 Version 1.5.14:
  * Campaigns:
    * Descent into Darkness:
diff --git a/configure.ac b/configure.ac
index 55c4b494597..6028d63e638 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 
 AC_PREREQ([2.60])
 
-define([WESNOTH_VERSION],[1.5.14])
+define([WESNOTH_VERSION],[1.5.14+svn])
 define([WESNOTH_BUGS],[http://bugs.wesnoth.org])
 
 AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, WESNOTH_BUGS, [wesnoth])
diff --git a/players_changelog b/players_changelog
index db600e27b41..efa15d9c25b 100644
--- a/players_changelog
+++ b/players_changelog
@@ -2,7 +2,11 @@ This is meant to be a concise list of player-visible changes (very minor
 changes may be omitted). For a complete list of changes, see the main
 changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
 
-Version 1.5.17:
+Version 1.5.14+svn:
+  * Language and translations
+    * Updated translations:
+
+Version 1.5.14:
   * Campaigns:
     * Descent into Darkness:
       * Increased the experience requirement for the Ancient Lich from 150 to
diff --git a/src/wesconfig.h b/src/wesconfig.h
index d3e01d90de8..2c39c7d98c0 100644
--- a/src/wesconfig.h
+++ b/src/wesconfig.h
@@ -25,7 +25,7 @@
 #ifdef VERSION
   #undef VERSION
 #endif
-#define VERSION "1.5.14-1.6rc3"
+#define VERSION "1.5.14+svn"
 
 #ifndef PACKAGE
 #define PACKAGE "wesnoth"