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
..
qml
tests Merge branch 'KDE/4.9' 12 years ago
CMakeLists.txt
clientmodel.cpp Merge branch 'KDE/4.9' 12 years ago
clientmodel.h
declarative.cpp
declarative.h
desktopmodel.cpp
desktopmodel.h
kwinwindowswitcher.desktop
tabbox.cpp Merge branch 'KDE/4.9' 12 years ago
tabbox.h
tabboxconfig.cpp
tabboxconfig.h
tabboxhandler.cpp
tabboxhandler.h