summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-06-21 13:26:33 +0300
committerAndrei Karas <akaras@inbox.ru>2014-06-21 13:26:33 +0300
commitbcbf32f0ca331ea766148a534a2551b2e70fcc46 (patch)
tree7e72d6302f614bc8a79daa65be78ed082d71f61c
parent7dbbdee1837c32dae343662e77b7533ef8593812 (diff)
downloadplus-bcbf32f0ca331ea766148a534a2551b2e70fcc46.tar.gz
plus-bcbf32f0ca331ea766148a534a2551b2e70fcc46.tar.bz2
plus-bcbf32f0ca331ea766148a534a2551b2e70fcc46.tar.xz
plus-bcbf32f0ca331ea766148a534a2551b2e70fcc46.zip
Change version to 1.4.6.21.v1.4.6.21
-rw-r--r--ChangeLog9
-rw-r--r--README2
-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
8 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 766f44363..e59cd01ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-21 New release 1.4.6.21
+fix: chat window input field size if smiles button disabled.
+fix: make file for tmw branding.
+fix: some spelling errors.
+add: fallback OpenGL renderer if OpenGL version too small.
+add: modern OpenGL renderer.
+add: improve speed in normalopengl renderer.
+add: shell script into tmw/evol branding.
+
2014-06-07 New release 1.4.6.7
fix: screenshot key in input fields in SDL2 builds.
fix: missing text while chat scrolling (up/down).
diff --git a/README b/README
index 90a0185c3..7da7c73cd 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.4.6.7 Date: 2014-06-07
+ Version: 1.4.6.21 Date: 2014-06-21
Development team:
- See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 7596b9e46..1824c3171 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.4.6.7 Date: 2014-06-07
+ Version: 1.4.6.21 Date: 2014-06-21
Development team:
- See AUTHORS file for a list
diff --git a/build/packevol b/build/packevol
index 14b520bbb..0274e31d6 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.4.6.7" \
+ -DPRODUCT_VERSION="1.4.6.21" \
-DEXESUFFIX=/src \
-DUPX=true \
evol.nsi
diff --git a/build/packtmw b/build/packtmw
index 06a271f65..b23dfb3d6 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.4.6.7" \
+ -DPRODUCT_VERSION="1.4.6.21" \
-DEXESUFFIX=/src \
-DUPX=true \
tmw.nsi
diff --git a/build/packwin b/build/packwin
index aee82426c..62a0eb4c6 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.4.6.7" \
+ -DPRODUCT_VERSION="1.4.6.21" \
-DEXESUFFIX=/src \
-DUPX=true \
setup.nsi
diff --git a/configure.ac b/configure.ac
index 126a88d41..f2721f322 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.4.6.7], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.4.6.21], [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 69f4732a8..7089ac6ba 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.4.6.7"
-#define CHECK_VERSION "01.04.06.07"
+#define SMALL_VERSION "1.4.6.21"
+#define CHECK_VERSION "01.04.06.21"
#ifdef HAVE_CONFIG_H
#include "../config.h"