Martin Gräßlin 90365e27d0 Merge branch 'KDE/4.9' ... Conflicts: khotkeys/data/kde32b1.khotkeys kinfocenter/Modules/opengl/opengl.desktop kwin/tabbox/tests/CMakeLists.txt plasma/generic/applets/system-monitor/plasma-applet-sm_hdd_activity.desktop		2012-08-17 17:59:49 +02:00
..
clients	Merge branch 'KDE/4.9'	2012-08-17 17:59:49 +02:00
CMakeLists.txt
desktop.qml
IconTabBox.qml
tabbox.qml