Change version to 1.2.2.5.v1.2.2.5

7 files changed, 36 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index cf8c29553..2474682d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2012-02-05 New release 1.2.2.5
+ManaPlus:
+fix: particle font in japan localisation.
+fix: some untranslated strings.
+fix: possible crash after switching servers.
+fix: option "attack range" in evol server.
+fix: drop counter with enabled "buggy servers protection".
+fix: empty custom update server.
+add: request client language from server. (evol server)
+add: moving camera by npc commands. (evol server)
+add: evol branding in windows installer.
+add: extended online list. (evol server)
+add: redesign char creation dialog.
+add: resize window from video settings tab.
+add: option to enable/disable window resize.
+add: option to show/hide window frame border.
+add: 3 new emotes by (Nina O'Reilly)
+add: support for 48 emotes.
+add: redesign servers list dialog, using new server editor.
+add: increase login dialog size.
+add: use translation for description in servers dialog.
+
+Mana:
+fix: infinite character selection with command line parameter --character
+add: resize update window.
+add: separate server editor.
+add: possible improve loading images/music.
+add: game window resize.
+
 2012-01-22 New release 1.2.1.22
 fix: bad update hosts handling.
 fix: possible crashes.
diff --git a/README b/README
index 995b0cda8..d7e46430c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.2.1.22        Date: 2012-01-22
+ Version: 1.2.2.5        Date: 2012-02-05
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 28a0ddd92..4f4a397fc 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.2.1.22        Date: 2012-01-22

+ Version: 1.2.2.5        Date: 2012-02-05

 

  Development team:

   - See AUTHORS file for a list

diff --git a/build/packevol b/build/packevol
index a9443acd3..9059fdf58 100755
--- a/build/packevol
+++ b/build/packevol
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="1.2.1.22" \
+    -DPRODUCT_VERSION="1.2.2.5" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     evol.nsi
diff --git a/build/packwin b/build/packwin
index d855cf534..296039482 100755
--- a/build/packwin
+++ b/build/packwin
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="1.2.1.22" \
+    -DPRODUCT_VERSION="1.2.2.5" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index 7b1afbdaf..ef92317d6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.2.1.22], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.2.2.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 541296d22..fbc672939 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.2.1.22"
-#define CHECK_VERSION "01.02.01.22"
+#define SMALL_VERSION "1.2.2.5"
+#define CHECK_VERSION "01.02.02.05"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"