Change version to 1.5.2.14.v1.5.2.14

9 files changed, 18 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 7f081255c..01b34050b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-02-14 New release 1.5.2.14
+fix: camera position if npc dialog was closed by server script command closedialog.
+fix: make file for android.
+fix: storing player relations if switch servers.
+fix: storing attack mobs / pickups filter if switch server.
+fix: weight bar in inventory and cart window.
+add: personal sell shops support (hercules).
+add: improve skill error messages.
+
 2015-01-31 New release 1.5.1.31
 fix: mixed chat lines with colors and emotes.
 fix: follow (hercules)
diff --git a/README b/README
index 97e6cf2ae..f21f6c97c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.5.1.31        Date: 2015-01-31
+ Version: 1.5.2.14        Date: 2015-02-14
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.md b/README.md
index cd11d9082..fc5f6a612 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![The Mana World logo](data/icons/manaplus.png)
 
-Version: 1.5.1.31        Date: 2015-01-31
+Version: 1.5.2.14        Date: 2015-02-14
 
 ###Development team:
  - See [AUTHORS](AUTHORS) file for a list
diff --git a/README.txt b/README.txt
index 2059d5f42..a6ab3fe40 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.5.1.31        Date: 2015-01-31

+ Version: 1.5.2.14        Date: 2015-02-14

 

  Development team:

   - See AUTHORS file for a list

diff --git a/build/packevol b/build/packevol
index cd92c4ac3..8574500f7 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.1.31" \
+    -DPRODUCT_VERSION="1.5.2.14" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     evol.nsi
diff --git a/build/packtmw b/build/packtmw
index 6c769c1a8..be205b16f 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.1.31" \
+    -DPRODUCT_VERSION="1.5.2.14" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     tmw.nsi
diff --git a/build/packwin b/build/packwin
index e95d53913..5fe97fc8a 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.1.31" \
+    -DPRODUCT_VERSION="1.5.2.14" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index 42029a26f..cba48d270 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.5.1.31], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.5.2.14], [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 e0e61e59f..1b73bd3a6 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.1.31"
-#define CHECK_VERSION "01.05.01.31"
+#define SMALL_VERSION "1.5.2.14"
+#define CHECK_VERSION "01.05.02.14"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"