Change version to 1.2.11.25v1.2.11.25

7 files changed, 21 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ff1c0d61..e755bb23f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-11-25 New release 1.2.11.25
+fix: some fixes in jewelry theme.
+fix: disable some popups in Android version.
+fix: drops window cleaning.
+fix: missing themes in windows installer.
+fix: random incorrect beings draw order.
+add: show/hide on screen keyboard on Android.
+add: attack human chat command (by Travolta)
+command: /atkhuman
+add: extend theming.
+add: onscreen joystick.
+add: improve OpenGL draw speed.
+add: persistend directories under Android.
+
 2012-11-11 New release 1.2.11.11
 fix: resolution switching under Android with OpenGL.
 fix: guichan draw lines under ARM.
diff --git a/README b/README
index d626ddc31..e02a5cf64 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.2.11.11        Date: 2012-11-11
+ Version: 1.2.11.25        Date: 2012-11-25
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 99fc81df3..491520aa5 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

 ===============

 

- Version: 1.2.11.11        Date: 2012-11-11

+ Version: 1.2.11.25        Date: 2012-11-25

 

  Development team:

   - See AUTHORS file for a list

diff --git a/build/packevol b/build/packevol
index 0500811e3..989d0f72c 100755
--- a/build/packevol
+++ b/build/packevol
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../libs/dll/ \
-    -DPRODUCT_VERSION="1.2.11.11" \
+    -DPRODUCT_VERSION="1.2.11.25" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     evol.nsi
diff --git a/build/packwin b/build/packwin
index f0e67ca80..1dbafc972 100755
--- a/build/packwin
+++ b/build/packwin
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../libs/dll/ \
-    -DPRODUCT_VERSION="1.2.11.11" \
+    -DPRODUCT_VERSION="1.2.11.25" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index 5fc4f7422..8378ce19b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.2.11.11], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.2.11.25], [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 4f2bb5f43..99cba18fc 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.11.11"
-#define CHECK_VERSION "01.02.11.11"
+#define SMALL_VERSION "1.2.11.25"
+#define CHECK_VERSION "01.02.11.25"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"