Change version to 1.5.4.25.

9 files changed, 24 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 489a7e060..b9dd92f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2015-04-25 New release 1.5.4.25
+fix: move animation.
+fix: wrong slots update (hercules)
+fix: error message with delayed items (hercules)
+fix: characters list after password change.
+fix: default walk speed in stats (hercules)
+fix: kill stats window on levelup.
+fix: displaying mod stat with value -1.
+add: mirror support for servers list.
+add: change password support (hercules)
+add: quick settings page (yellow bar in settings)
+add: help messages for chat settings page.
+add: experimental support for CilkPlus (disabled by default).
+remove: hide shield setting.
+
 2015-04-11 New release 1.5.4.11
 fix: chat command /me.
 fix: remove from priority attack list.
diff --git a/README b/README
index c6d2bb048..cc2541c93 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.5.4.11        Date: 2015-04-11
+ Version: 1.5.4.25        Date: 2015-04-25
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.md b/README.md
index fdae75bba..56ca6fa71 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![The Mana World logo](data/icons/manaplus.png)
 
-Version: 1.5.4.11        Date: 2015-04-11
+Version: 1.5.4.25        Date: 2015-04-25
 
 ###Development team:
  - See [AUTHORS](AUTHORS) file for a list
diff --git a/README.txt b/README.txt
index c4a0f8b66..6172ed248 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.5.4.11        Date: 2015-04-11

+ Version: 1.5.4.25        Date: 2015-04-25

 

  Development team:

   - See AUTHORS file for a list

diff --git a/build/packevol b/build/packevol
index d7b37973e..fea44604b 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.5.4.11" \
+    -DPRODUCT_VERSION="1.5.4.25" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     evol.nsi
diff --git a/build/packtmw b/build/packtmw
index 249f99215..42d1763c8 100755
--- a/build/packtmw
+++ b/build/packtmw
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../libs/dll/ \
-    -DPRODUCT_VERSION="1.5.4.11" \
+    -DPRODUCT_VERSION="1.5.4.25" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     tmw.nsi
diff --git a/build/packwin b/build/packwin
index 42d9955cc..1aa06a17e 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.5.4.11" \
+    -DPRODUCT_VERSION="1.5.4.25" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index d8abded8c..3593ce75f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.5.4.11], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.5.4.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 d29070421..ac1420c4c 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.5.4.11"
-#define CHECK_VERSION "01.05.04.11"
+#define SMALL_VERSION "1.5.4.25"
+#define CHECK_VERSION "01.05.04.25"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"