Change version to 1.1.6.12

6 files changed, 24 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index e2949753a..b2513dcae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2011-06-12 New release 1.1.6.12
+ManaPlus:
+fix: outfits item selection.
+fix: item slots in "show items" menu item.
+fix: memory leaks.
+fix: item colors in different windows.
+add: secure font for highlighting incorrect nicks.
+add: gender sign with any players names.
+add: extend quick move items from inventory and back (LSHIFT)
+modifier key + left click - move all items from/to storage.
+modifier key + right clikc - show window for amount selection for moving.
+modifier key + drop button - drop all items from selected slot.
+add: add "drop all" to context menu.
+add: menu item to copy text from bars to chat.
+add: did you know window.
+add: improve software draw mode (SDL) speed.
+
+
 2011-05-29 New release 1.1.5.29
 ManaPlus:
 fix: infinite paste.
diff --git a/README b/README
index 4e44805d9..1c724308e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.5.29        Date: 2011-05-29
+ Version: 1.1.6.12        Date: 2011-06-12
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 153c3cddf..cbc56a9b7 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.1.5.29        Date: 2011-05-29

+ Version: 1.1.6.12        Date: 2011-06-12

 

  Development team:

   - See AUTHORS file for a list

diff --git a/configure.ac b/configure.ac
index 065f389c0..3e69f6523 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.1.5.29], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.1.6.12], [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 476d331eb..96e37b2b2 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.29" \
+    -DPRODUCT_VERSION="1.1.6.12" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/src/main.h b/src/main.h
index b93d363d4..b6c2b858c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -91,8 +91,8 @@
 //define DEBUG_ALPHA_CACHE 1
 //define DEBUG_OPENGL_LEAKS 1
 
-#define SMALL_VERSION "1.1.5.29"
-#define CHECK_VERSION "01.01.05.29"
+#define SMALL_VERSION "1.1.6.12"
+#define CHECK_VERSION "01.01.06.12"
 
 
 #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \