summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-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, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 812139ee5..49579bf6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-04 New release 1.5.7.4
+fix: draw attack rectange under beings.
+fix: being position with heights layer.
+add: some missing checks.
+remove: outdated code used in evol v1.
+
2015-06-20 New release 1.5.6.20
fix: tab colors update.
fix: bars context menu.
diff --git a/README b/README
index f9252c7c5..c7f9548e3 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.5.6.29 Date: 2015-06-20
+ Version: 1.5.7.4 Date: 2015-07-04
Development team:
- See AUTHORS file for a list
diff --git a/README.md b/README.md
index f8f892e9d..eb2580a7d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
![The Mana World logo](data/icons/manaplus.png)
-Version: 1.5.6.20 Date: 2015-06-20
+Version: 1.5.7.4 Date: 2015-07-04
### Development team:
- See [AUTHORS](AUTHORS) file for a list
diff --git a/README.txt b/README.txt
index 75e471ed8..eadd7fddd 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.5.6.20 Date: 2015-06-20
+ Version: 1.5.7.4 Date: 2015-07-04
Development team:
- See AUTHORS file for a list
diff --git a/build/packevol b/build/packevol
index b86e13d1d..65c83fb0f 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.6.20" \
+ -DPRODUCT_VERSION="1.5.7.4" \
-DEXESUFFIX=/src \
-DUPX=true \
evol.nsi
diff --git a/build/packtmw b/build/packtmw
index 6191c0750..483e6c292 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.6.20" \
+ -DPRODUCT_VERSION="1.5.7.4" \
-DEXESUFFIX=/src \
-DUPX=true \
tmw.nsi
diff --git a/build/packwin b/build/packwin
index 551ffae45..62270a70a 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.6.20" \
+ -DPRODUCT_VERSION="1.5.7.4" \
-DEXESUFFIX=/src \
-DUPX=true \
setup.nsi
diff --git a/configure.ac b/configure.ac
index 7ce00737c..b5c6fd3e8 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.5.6.20], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.5.7.4], [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 a1a2aa62d..7a8bca4c9 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.6.20"
-#define CHECK_VERSION "01.05.06.20"
+#define SMALL_VERSION "1.5.7.4"
+#define CHECK_VERSION "01.05.07.04"
#ifdef HAVE_CONFIG_H
#include "../config.h"