Change version to 1.5.12.5v1.5.12.5

9 files changed, 19 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index ad0310734..7e7c3bcb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-12-05 New release 1.5.12.5
+fix: allow kill infinite life particles if parent was killed.
+fix: missing selection images in mana theme in windows.
+add: skill level selection for invoking skills.
+add: chat command for invoke skills.
+add: teleport skills location selection (hercules).
+add: spirit balls (hercules).
+add: basic OpenGL support in nacl.
+add: open urls and clipboard support in nacl (vasily_makarov).
+
 2015-11-21 New release 1.5.11.21
 fix: crash with enabled missing status effect.
 fix: scrollbars drawing in jewelry and golden delicious themes.
diff --git a/README b/README
index 27a91c1a2..15ef6a5ae 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.5.11.21        Date: 2015-11-21
+ Version: 1.5.12.5        Date: 2015-12-05
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.md b/README.md
index 11f757724..72a74f0e8 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![The Mana World logo](data/icons/manaplus.png)
 
-Version: 1.5.11.21        Date: 2015-11-21
+Version: 1.5.12.5        Date: 2015-12-05
 
 ### Development team:
  - See [AUTHORS](AUTHORS) file for a list
diff --git a/README.txt b/README.txt
index 3e232d8de..22f663247 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.5.11.21        Date: 2015-11-21

+ Version: 1.5.12.5        Date: 2015-12-05

 

  Development team:

   - See AUTHORS file for a list

diff --git a/build/packevol b/build/packevol
index f927fb338..41a61a818 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.11.21" \
+    -DPRODUCT_VERSION="1.5.12.5" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     evol.nsi
diff --git a/build/packtmw b/build/packtmw
index 332b1e040..60a9206fa 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.11.21" \
+    -DPRODUCT_VERSION="1.5.12.5" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     tmw.nsi
diff --git a/build/packwin b/build/packwin
index 628627b2c..a2e0b5dd2 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.11.21" \
+    -DPRODUCT_VERSION="1.5.12.5" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index 548e18f04..8260b0588 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.5.11.21], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.5.12.5], [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 93d4cf08c..6f71bcd84 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.11.21"
-#define CHECK_VERSION "01.05.11.21"
+#define SMALL_VERSION "1.5.12.5"
+#define CHECK_VERSION "01.05.12.05"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"