Change version to 1.2.4.15v1.2.4.15

7 files changed, 25 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 047a331c1..ce0fe7b22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2012-04-15 New release 1.2.4.15
+fix: cancel update fix.
+fix: multiple conflicts between windows and game keys.
+fix: random crash in chat update.
+fix: possible crash after connecting to game.
+fix: assign keys before connecting to game.
+fix: cmake build flags.
+add: proxy support for download updates.
+add: change autohide buttons to three state (hide/show/hide in small resolution).
+add: show client version in game window header.
+add: clear in drops window context menu.
+add: improve fill rectange speed in software mode.
+add: option for enable disable textures blurring.
+by default enabled.
+add: allow assign 3 keys or joystick buttons to any action.
+add: unselect item inventory if it was added to other windows.
+add: extend sdl unknown keys for usage in any actions.
+
 2012-04-01 New release 1.2.4.1
 fix: validate assigned keys on load.
 fix: animated tiles drawing in opengl modes.
diff --git a/README b/README
index cdf6b5679..da5315bc1 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.2.4.1        Date: 2012-04-01
+ Version: 1.2.4.15        Date: 2012-04-15
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 3a0f6f508..ad89dd3ff 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.2.4.1        Date: 2012-04-01

+ Version: 1.2.4.15        Date: 2012-04-15

 

  Development team:

   - See AUTHORS file for a list

diff --git a/build/packevol b/build/packevol
index 3c522e650..9dc88435e 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.1" \
+    -DPRODUCT_VERSION="1.2.4.15" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     evol.nsi
diff --git a/build/packwin b/build/packwin
index 5491395b5..6d1b3a7eb 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.1" \
+    -DPRODUCT_VERSION="1.2.4.15" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index 1ff9a7d90..76e487fa1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.2.4.1], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.2.4.15], [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 a628b3953..f4f82e361 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.1"
-#define CHECK_VERSION "01.02.04.01"
+#define SMALL_VERSION "1.2.4.15"
+#define CHECK_VERSION "01.02.04.15"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"