Martin Gräßlin 777513a0c8 Merge branch 'KDE/4.9' ... 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		2012-10-12 07:59:22 +02:00
..
aurorae	Merge branch 'KDE/4.9'	2012-10-12 07:59:22 +02:00
b2	add deco API versioning support	2012-05-17 23:26:43 +02:00
laptop	SVN_SILENT made messages (.desktop file)	2012-06-12 17:07:51 +02:00
oxygen	properly deal with invalid colors when calculating cache keys.	2012-08-29 14:53:40 +02:00
plastik	add deco API versioning support	2012-05-17 23:26:43 +02:00
CMakeLists.txt	Build option to disable the Oxygen window decoration	2012-10-04 17:09:39 +02:00
Messages.sh	Remove temporary file	2008-07-02 07:04:51 +00:00