You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Martin Gräßlin 3aee94d798 Merge branch 'KDE/4.9'
Conflicts:
	ksysguard/gui/ksysguard.desktop
	kwin/effects/translucency/translucency.cpp
12 years ago
..
CMakeLists.txt
translucency.cpp Merge branch 'KDE/4.9' 12 years ago
translucency.desktop
translucency.h
translucency_config.cpp
translucency_config.desktop
translucency_config.h
translucency_config.ui