Merge branch 'master' into strippedstripped1.1.11.12

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/focushandler.cpp
	src/guichan/graphics.cpp
	src/guichan/gui.cpp
	src/guichan/image.cpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/sdl/sdlgraphics.cpp
	src/guichan/sdl/sdlimage.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/icon.cpp
	src/guichan/widgets/imagebutton.cpp
	src/guichan/widgets/listbox.cpp
	src/guichan/widgets/scrollarea.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textbox.cpp
	src/guichan/widgets/window.cpp

1 files changed, 21 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f1158ae7d..cbf0956f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2011-11-12 New release 1.1.11.12
+ManaPlus:
+fix: hide death message on reconnect.
+fix: stop move after open npc dialog.
+fix: disable incomplete hr, hy translations.
+fix: self player ignore.
+fix: double network error dialog.
+fix: joystick support.
+fix: random key press loses.
+add: pseudo away.
+Command: /pseudoaway text
+add: enemy relation. (no any ignore, but mark player as enemy)
+add: option for attack players in pvp "Switch pvp attack". Default key not assigned
+add: interface language selection.
+Settings / Theme / Language.
+add: Bold text type in chat. (To enable command ##B, to disable ##b)
+Example: ##Bbold##b text.
+add: update mplus fonts.
+add: joystick selection, option for joystick usage only in active game.
+add: enable joystick hat (if exists).
+
 2011-10-30 New release 1.1.10.30
 ManaPlus:
 fix: disable autofix position for archer mode.