Change version to 1.1.4.17.

6 files changed, 19 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index c633bc418..1ecd3f277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-04-17 New release 1.1.4.17
+ManaPlus:
+fix: add to trade menu item in inventory context menu.
+fix: update error if update file list have empty lines (like in aethyra).
+fix: manaserv support deprecated. By default all compilation scripts ignoring manaserv.
+fix: inventory equip/unequip buttons.
+fix: protected pickups spam.
+fix: show unknown items in inventory.
+add: moved help from chat to help window.
+add: update progress files counter.
+add: custom autocomplete words list. Place in customwords.txt.
+add: dont waste chat space if input box is hidden.
+
 2011-04-03 New release 1.1.4.3
 ManaPlus:
 fix: improve opengl speed.
diff --git a/README b/README
index 29e54a339..f8e134908 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.4.3        Date: 2011-04-03
+ Version: 1.1.4.17        Date: 2011-04-17
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 322482368..3b3aa7bef 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

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

 

- Version: 1.1.4.3        Date: 2011-04-03

+ Version: 1.1.4.17        Date: 2011-04-17

 

  Development team:

   - See AUTHORS file for a list

diff --git a/configure.ac b/configure.ac
index 9f8a58a5f..ca3929379 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.1.4.3], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.1.4.17], [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 0aa66ab21..c35d29cee 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.4.3" \
+    -DPRODUCT_VERSION="1.1.4.17" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/src/main.h b/src/main.h
index f7d2af37b..aeb27d7e8 100644
--- a/src/main.h
+++ b/src/main.h
@@ -89,8 +89,8 @@
 //define DEBUG_FONT_COUNTERS 1
 //define DEBUG_ALPHA_CACHE 1
 
-#define SMALL_VERSION "1.1.4.3"
-#define CHECK_VERSION "01.01.04.03"
+#define SMALL_VERSION "1.1.4.17"
+#define CHECK_VERSION "01.01.04.17"
 
 
 #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \