Change version to 1.5.6.20.v1.5.6.20

9 files changed, 18 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 59d8e11f6..812139ee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-06-20 New release 1.5.6.20
+fix: tab colors update.
+fix: bars context menu.
+add: use persistent ip option if switch map servers.
+add: new configurable colors: enemy, team1, team2, team3.
+add: split configurable colors to groups.
+add: use nick colors depend on team (pvp for tmwa)
+add: option minimal gm level for show gm chat tab.
+
 2015-06-06 New release 1.5.6.6
 fix: buy/sell from personal shops if stand close to npc.
 fix: possible crash if disconnect from server.
diff --git a/README b/README
index 13e7d5794..f9252c7c5 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.5.6.6        Date: 2015-06-06
+ Version: 1.5.6.29        Date: 2015-06-20
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.md b/README.md
index 394dc6553..f8f892e9d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![The Mana World logo](data/icons/manaplus.png)
 
-Version: 1.5.6.6        Date: 2015-06-06
+Version: 1.5.6.20        Date: 2015-06-20
 
 ### Development team:
  - See [AUTHORS](AUTHORS) file for a list
diff --git a/README.txt b/README.txt
index ec9913868..75e471ed8 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.5.6.6        Date: 2015-06-06

+ Version: 1.5.6.20        Date: 2015-06-20

 

  Development team:

   - See AUTHORS file for a list

diff --git a/build/packevol b/build/packevol
index c5c6cc9d9..b86e13d1d 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.6" \
+    -DPRODUCT_VERSION="1.5.6.20" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     evol.nsi
diff --git a/build/packtmw b/build/packtmw
index 4ccbf6197..6191c0750 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.6" \
+    -DPRODUCT_VERSION="1.5.6.20" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     tmw.nsi
diff --git a/build/packwin b/build/packwin
index dc3394252..551ffae45 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.6" \
+    -DPRODUCT_VERSION="1.5.6.20" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index 5c4223679..7ce00737c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.5.6.6], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.5.6.20], [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 0eb0fa581..a1a2aa62d 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.6"
-#define CHECK_VERSION "01.05.06.06"
+#define SMALL_VERSION "1.5.6.20"
+#define CHECK_VERSION "01.05.06.20"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"