777513a0c8
Conflicts: ksmserver/themes/contour/metadata.desktop ksmserver/themes/default/metadata.desktop kwin/kcmkwin/kwinscripts/kwinscripts.desktop kwin/scripts/videowall/metadata.desktop kwin/tabbox/qml/clients/compact/metadata.desktop kwin/tabbox/qml/clients/present_windows/metadata.desktop plasma/desktop/containments/desktop/plasma-containment-desktop.desktop plasma/generic/applets/system-monitor/plasma-applet-sm_hdd_activity.desktop plasma/generic/runners/nepomuksearch/plasma-runner-nepomuksearch.desktop plasma/generic/runners/places/plasma-runner-places.desktop plasma/generic/runners/webshortcuts/plasma-runner-webshortcuts.desktop powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop powerdevil/kcmodule/global/powerdevilglobalconfig.desktop powerdevil/kcmodule/profiles/powerdevilprofilesconfig.desktop |
||
---|---|---|
.. | ||
clients | ||
CMakeLists.txt | ||
desktop.qml | ||
IconTabBox.qml | ||
tabbox.qml |