From bd680e7f1fbc7603b8a2adb4f19613c8075bc2a6 Mon Sep 17 00:00:00 2001
From: Isaac Clerencia Perez <isaac@users.sf.net>
Date: Tue, 30 May 2006 06:04:04 +0000
Subject: [PATCH] Approaching 1.1.4

---
 changelog       | 2 +-
 config.h.dummy  | 8 ++++----
 configure.ac    | 4 ++--
 src/wesconfig.h | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/changelog b/changelog
index 966f3692c40..09f6f63a11b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-Trunk (1.1.3+svn):
+Version 1.1.4:
  * language and i18n:
    * updated translations: Czech, German, Slovak
  * help menu
diff --git a/config.h.dummy b/config.h.dummy
index 2f1e1c16b71..8326216d158 100644
--- a/config.h.dummy
+++ b/config.h.dummy
@@ -9,17 +9,17 @@
 #define PACKAGE_NAME "Battle for Wesnoth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Battle for Wesnoth 1.1.3+svn"
+#define PACKAGE_STRING "Battle for Wesnoth 1.1.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "wesnoth"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.3+svn"
+#define PACKAGE_VERSION "1.1.4"
 
 /* Version number of package */
-#define VERSION "1.1.3+svn"
+#define VERSION "1.1.4"
 
 /* The default server for this version */
-#define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14998"
+#define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14999"
 
diff --git a/configure.ac b/configure.ac
index f2cd2e16dc3..693fd13ae05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,10 @@
 
 AC_PREREQ([2.57])
 
-define([WESNOTH_VERSION],[1.1.3+svn])
+define([WESNOTH_VERSION],[1.1.4])
 
 dnl define([DEFAULT_SERVER],[server.wesnoth.org])
-define([DEFAULT_SERVER],[devsrv.wesnoth.org:14998])
+define([DEFAULT_SERVER],[devsrv.wesnoth.org:14999])
 
 AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, [davidnwhite@verizon.net], [wesnoth])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["]DEFAULT_SERVER["], [The default server for this version])
diff --git a/src/wesconfig.h b/src/wesconfig.h
index e318e8c0647..84e48e0a8fb 100644
--- a/src/wesconfig.h
+++ b/src/wesconfig.h
@@ -4,8 +4,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #else
-# define VERSION "1.1.3+svn"
-# define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14998"
+# define VERSION "1.1.4"
+# define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14999"
 # define PACKAGE "wesnoth"
 # ifndef LOCALEDIR
 #  define LOCALEDIR "translations"