Merge branch 'KDE/4.9'

Conflicts:
	kwin/effects/diminactive/diminactive.cpp
This commit is contained in:
Martin Gräßlin 2012-10-14 20:28:36 +02:00
commit e0570f34da

View file

@ -49,6 +49,7 @@ void DimInactiveEffect::reconfigure(ReconfigureFlags)
dim_keepabove = DimInactiveConfig::dimKeepAbove();
dim_by_group = DimInactiveConfig::dimByGroup();
dim_strength = DimInactiveConfig::strength();
effects->addRepaintFull();
}
void DimInactiveEffect::prePaintScreen(ScreenPrePaintData& data, int time)