summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-06-25 18:53:29 +0300
committerAndrei Karas <akaras@inbox.ru>2011-06-25 18:53:29 +0300
commit66d8bf35bbe94e8bd383cc5e479c21bd3c3e37d4 (patch)
treef9df2aa47b387d3ecf607616da092c5686a1c7df
parent748c6764f15fa65ee6cbcc5557b9db15562b436e (diff)
downloadplus-66d8bf35bbe94e8bd383cc5e479c21bd3c3e37d4.tar.gz
plus-66d8bf35bbe94e8bd383cc5e479c21bd3c3e37d4.tar.bz2
plus-66d8bf35bbe94e8bd383cc5e479c21bd3c3e37d4.tar.xz
plus-66d8bf35bbe94e8bd383cc5e479c21bd3c3e37d4.zip
Change version to 1.1.6.26.v1.1.6.26
-rw-r--r--ChangeLog16
-rw-r--r--README4
-rw-r--r--README.txt4
-rwxr-xr-xconfigure.ac2
-rwxr-xr-xpackwin2
-rw-r--r--src/main.h4
6 files changed, 22 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index b2513dcae..cd355e5f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2011-06-26 New release 1.1.6.26
+ManaPlus:
+fix: context menu positions.
+fix: copy equiped to outfits.
+fix: revert video resolutiion changes if new is fail.
+fix: some more memory leaks.
+add: own comments to players.
+add: option to use local time in chat.
+Can be changed here: SET / Chat / Use local time.
+add: redesigned setup pages.
+add: missing video modes.
+add: updated some windows libs.
+add: tooltips in skills dialog.
+add: archlinux PKGBUILD file.
+
+
2011-06-12 New release 1.1.6.12
ManaPlus:
fix: outfits item selection.
diff --git a/README b/README
index 1c724308e..de58c68c3 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.1.6.12 Date: 2011-06-12
+ Version: 1.1.6.26 Date: 2011-06-26
Development team:
- See AUTHORS file for a list
@@ -9,10 +9,8 @@ THE MANA PLUS CLIENT
Powered by:
- SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_net (Media framework), SDL_gfx
- - Guichan (GUI framework)
- libxml2 (XML parsing and writing)
- PhysFS (Data files)
- - ENet (UDP networking library)
- libcurl (HTTP downloads)
- zlib (Archives)
diff --git a/README.txt b/README.txt
index cbc56a9b7..3c4cbd072 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.1.6.12 Date: 2011-06-12
+ Version: 1.1.6.26 Date: 2011-06-26
Development team:
- See AUTHORS file for a list
@@ -9,10 +9,8 @@ THE MANA PLUS CLIENT
Powered by:
- SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_net (Media framework), SDL_gfx
- - Guichan (GUI framework)
- libxml2 (XML parsing and writing)
- PhysFS (Data files)
- - ENet (UDP networking library)
- libcurl (HTTP downloads)
- zlib (Archives)
diff --git a/configure.ac b/configure.ac
index f7c82ef75..067cec31b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.1.6.12], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.1.6.26], [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 96e37b2b2..a730088b7 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.6.12" \
+ -DPRODUCT_VERSION="1.1.6.26" \
-DEXESUFFIX=/src \
-DUPX=true \
setup.nsi
diff --git a/src/main.h b/src/main.h
index b6c2b858c..40b555221 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.6.12"
-#define CHECK_VERSION "01.01.06.12"
+#define SMALL_VERSION "1.1.6.26"
+#define CHECK_VERSION "01.01.06.26"
#define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \