Change version to 1.1.5.15.v1.1.5.15

6 files changed, 20 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e5f99f20..f72f91410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-05-15 New release 1.1.5.15
+ManaPlus:
+fix: targeting monster if monster added to priority attack list and "cycle mobs select" disabled.
+fix: improved text cache cleaning.
+fix: chat tab incorrect size if enabled hiding chat input line.
+add: ask password before deleting char.
+add: save attack filter.
+add: updated japan fonts.
+add: improved moving with mouse.
+add: spanish help translation.
+add: air and water collisions (incompotable with tmw).
+
+
 2011-05-01 New release 1.1.5.1
 ManaPlus:
 fix: some controls draw issue in SDL software mode.
@@ -14,6 +27,7 @@ add: spec file for rpm distros (mageia).
 Mana:
 add: music fadeout.
 
+
 2011-04-17 New release 1.1.4.17
 ManaPlus:
 fix: add to trade menu item in inventory context menu.
diff --git a/README b/README
index e2f56f95b..31db064ab 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.5.1        Date: 2011-05-01
+ Version: 1.1.5.15        Date: 2011-05-15
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 11b0ec8d0..07c7bf7b7 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.1.5.1        Date: 2011-05-01

+ Version: 1.1.5.15        Date: 2011-05-15

 

  Development team:

   - See AUTHORS file for a list

diff --git a/configure.ac b/configure.ac
index 7adfa67d2..c7f0b462f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.1.5.1], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.1.5.15], [akaras@inbox.ru], [manaplus])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
diff --git a/packwin b/packwin
index 6095f39f3..a07cdc5c1 100755
--- a/packwin
+++ b/packwin
@@ -5,7 +5,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="1.1.5.1" \
+    -DPRODUCT_VERSION="1.1.5.15" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/src/main.h b/src/main.h
index 0dd9374ad..21316886b 100644
--- a/src/main.h
+++ b/src/main.h
@@ -90,8 +90,8 @@
 //define DEBUG_ALPHA_CACHE 1
 //define DEBUG_OPENGL_LEAKS 1
 
-#define SMALL_VERSION "1.1.5.1"
-#define CHECK_VERSION "01.01.05.01"
+#define SMALL_VERSION "1.1.5.15"
+#define CHECK_VERSION "01.01.05.15"
 
 
 #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \