Author: jimmacfx Date: Thu Nov 13 12:54:27 2008 New Revision: 53268 URL: http://svn.opensuse.org/viewcvs/yast?rev=53268&view=rev Log: fix merge conflict Modified: trunk/theme/SLE/wizard/installation.qss trunk/theme/package/yast2-theme.changes Modified: trunk/theme/SLE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/SLE/wizard/installation.qss?rev=53268&r1=53267&r2=53268&view=diff ============================================================================== --- trunk/theme/SLE/wizard/installation.qss (original) +++ trunk/theme/SLE/wizard/installation.qss Thu Nov 13 12:54:27 2008 @@ -427,7 +427,7 @@ } QToolTip { - background-color: #555; + background-color: #fffbdd; } .Contents YQPkgDescriptionView { Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.changes?rev=53268&r1=53267&r2=53268&view=diff ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Thu Nov 13 12:54:27 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Nov 13 12:48:54 CET 2008 - jimmac@novell.com + +- SLE: fix tooltip background color. bug #442450 + +------------------------------------------------------------------- Mon Nov 10 16:11:35 CET 2008 - coolo@suse.de - update from Martin for oxygen -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org