summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--README2
-rw-r--r--README.md2
-rw-r--r--README.txt2
-rwxr-xr-xbuild/packevol2
-rwxr-xr-xbuild/packtmw2
-rwxr-xr-xbuild/packwin2
-rwxr-xr-xconfigure.ac2
-rw-r--r--src/main.h4
9 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ed109339..a5d389b8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-10-14 New release 1.7.10.14
+fix: some wrong asserts in text command editor.
+add: configure parameter for set working directory for unit tests.
+
2017-09-30 New release 1.7.9.30
fix: disconnect chat command.
fix: max packet version in server editor.
diff --git a/README b/README
index 6eaef22ab..ef8d10c57 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.7.9.30 Date: 2017-09-30
+ Version: 1.7.10.14 Date: 2017-10-14
Build status:
Gitlab CI: https://gitlab.com/manaplus/manaplus/badges/master/build.svg
diff --git a/README.md b/README.md
index 61ea87512..488b35251 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
![ManaPlus logo](data/icons/manaplus.png)
-Version: 1.7.9.30 Date: 2017-09-30
+Version: 1.7.10.14 Date: 2017-10-14
### Build status
diff --git a/README.txt b/README.txt
index a88f6daec..6d1b4a8ad 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.7.9.30 Date: 2017-09-30
+ Version: 1.7.10.14 Date: 2017-10-14
Development team:
- See AUTHORS file for a list
diff --git a/build/packevol b/build/packevol
index 17a4aed88..d7a81860e 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.7.9.30" \
+ -DPRODUCT_VERSION="1.7.10.14" \
-DEXESUFFIX=/src \
-DUPX=true \
-DBITS=${BITS} \
diff --git a/build/packtmw b/build/packtmw
index 229e210ef..76c82740f 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.7.9.30" \
+ -DPRODUCT_VERSION="1.7.10.14" \
-DEXESUFFIX=/src \
-DUPX=true \
-DBITS=${BITS} \
diff --git a/build/packwin b/build/packwin
index 4ea00a4ea..845ddd810 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.7.9.30" \
+ -DPRODUCT_VERSION="1.7.10.14" \
-DEXESUFFIX=/src \
-DUPX=true \
-DBITS=${BITS} \
diff --git a/configure.ac b/configure.ac
index 9b309ed9e..a9ed26981 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.7.9.30], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.7.10.14], [akaras@inbox.ru], [manaplus])
AM_INIT_AUTOMAKE([1.9])
AC_LANG_CPLUSPLUS
diff --git a/src/main.h b/src/main.h
index 733d33037..2b6d6e9e9 100644
--- a/src/main.h
+++ b/src/main.h
@@ -40,8 +40,8 @@
* by the map, interleaved with the tiles in the fringe layer.
*/
-#define SMALL_VERSION "1.7.9.30"
-#define CHECK_VERSION "01.07.09.30"
+#define SMALL_VERSION "1.7.10.14"
+#define CHECK_VERSION "01.07.10.14"
#ifdef HAVE_CONFIG_H
#include "../config.h"