merge 0.9.19 in dev
authorkoda
Sun, 21 Apr 2013 01:38:52 +0200
changeset 8933 19be64b0f36e
parent 8925 f52c6f9800ca (diff)
parent 8932 e095e3023682 (current diff)
child 8934 a4ec39eac0be
merge 0.9.19 in dev
share/hedgewars/Data/Graphics/Hats/SunWukong.png
--- 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
--- 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
+}