From 742e6d9246e985a44713e01887e5744ea89372c8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 12 May 2012 17:19:56 +0300
Subject: Change version to 1.2.5.12.
---
ChangeLog | 11 +++++++++++
README | 2 +-
README.txt | 2 +-
build/packevol | 2 +-
build/packwin | 2 +-
configure.ac | 2 +-
src/main.h | 4 ++--
7 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ba924ebeb..ec92f8336 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-05-12 New release 1.2.5.12
+fix: keys for Next chat line/previous chat line.
+fix: autologin from command line.
+fix: move shortcuts windows.
+add: timeout option between connections to servers.
+add: pickup filter.
+add: replace obsolete opengl code.
+add: custom autorepeat for some actions.
+add; option for auto attack next target if attack was not cancelled.
+Disabled by default.
+
2012-04-29 New release 1.2.4.29
fix: bluring setting apply.
fix: split long lines in kill stats window.
diff --git a/README b/README
index 8b654240f..230ba0760 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.2.4.29 Date: 2012-04-29
+ Version: 1.2.5.12 Date: 2012-05-12
Development team:
- See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 61148d2ed..20e0f19f4 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.2.4.29 Date: 2012-04-29
+ Version: 1.2.5.12 Date: 2012-05-12
Development team:
- See AUTHORS file for a list
diff --git a/build/packevol b/build/packevol
index fa6ed3f61..fdabe053f 100755
--- a/build/packevol
+++ b/build/packevol
@@ -7,7 +7,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
- -DPRODUCT_VERSION="1.2.4.29" \
+ -DPRODUCT_VERSION="1.2.5.12" \
-DEXESUFFIX=/src \
-DUPX=true \
evol.nsi
diff --git a/build/packwin b/build/packwin
index a213aa340..1142ac684 100755
--- a/build/packwin
+++ b/build/packwin
@@ -7,7 +7,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
- -DPRODUCT_VERSION="1.2.4.29" \
+ -DPRODUCT_VERSION="1.2.5.12" \
-DEXESUFFIX=/src \
-DUPX=true \
setup.nsi
diff --git a/configure.ac b/configure.ac
index f487fb0f2..da9e33b89 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.2.4.29], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.2.5.12], [akaras@inbox.ru], [manaplus])
AM_INIT_AUTOMAKE([1.9])
AC_CONFIG_HEADERS([config.h:config.h.in])
AC_LANG_CPLUSPLUS
diff --git a/src/main.h b/src/main.h
index 1d8b42565..c09f48ef6 100644
--- a/src/main.h
+++ b/src/main.h
@@ -45,8 +45,8 @@
* different interfaces, which have different implementations for each server.
*/
-#define SMALL_VERSION "1.2.4.29"
-#define CHECK_VERSION "01.02.04.29"
+#define SMALL_VERSION "1.2.5.12"
+#define CHECK_VERSION "01.02.05.12"
#ifdef HAVE_CONFIG_H
#include "../config.h"
--
cgit v1.2.3-70-g09d2