# HG changeset patch
# User koda
# Date 1366501132 -7200
# Node ID 19be64b0f36e462ac14ea532f711079bd5aa0393
# Parent  f52c6f9800ca590be53565fb1046b35f0be168c4# Parent  e095e3023682a12e29ee3016e2063e7dd5578ab7
merge 0.9.19 in dev

diff -r e095e3023682 -r 19be64b0f36e .hgignore
--- a/.hgignore	Sun Apr 21 01:36:08 2013 +0200
+++ b/.hgignore	Sun Apr 21 01:38:52 2013 +0200
@@ -54,8 +54,8 @@
 glob:project_files/Android-build/SDL-android-project/.*
 glob:project_files/Android-build/out
 glob:project_files/Android-build/Makefile.android
-glob:hedgewars-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Debug
-glob:hedgewars-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Release
+glob:hedgewars-build-desktop-Qt*
+glob:hedgewars-build-desktop-Qt*
 glob:*.depends
 glob:tools/build_windows_koda.bat
 glob:share/hedgewars/Data/misc/hwengine.desktop
diff -r e095e3023682 -r 19be64b0f36e QTfrontend/res/css/qt.css
--- a/QTfrontend/res/css/qt.css	Sun Apr 21 01:36:08 2013 +0200
+++ b/QTfrontend/res/css/qt.css	Sun Apr 21 01:38:52 2013 +0200
@@ -176,9 +176,15 @@
 height: 10px;
 }
 
+QLabel {
+overflow: hidden;
+}
+
 QComboBox {
 border-radius: 10px;
 padding: 3px;
+height: 18px;
+overflow: hidden;
 }
 QComboBox:pressed{
 border-color: white;
@@ -326,4 +332,4 @@
 
 TeamSelWidget, #gameStackContainer, #GBoxOptions {
 border-radius: 10px;
-}
\ No newline at end of file
+}
diff -r e095e3023682 -r 19be64b0f36e share/hedgewars/Data/Graphics/Hats/SunWukong.png