kwin/tabbox/qml
Martin Gräßlin 969e6b85e7 Merge branch 'master' into frameworks-scratch
Conflicts:
	CMakeLists.txt
	kwin/client.cpp
	kwin/effects/highlightwindow/highlightwindow.cpp
	kwin/libkwineffects/kwingltexture.cpp
	kwin/libkwineffects/kwinxrenderutils.cpp
	kwin/scene_opengl.cpp
	kwin/workspace.cpp
	plasma/desktop/applets/kickoff/CMakeLists.txt
	plasma/desktop/applets/taskmanager/package/contents/code/tools.js
	plasma/desktop/applets/taskmanager/package/contents/ui/Task.qml
	plasma/desktop/applets/taskmanager/package/contents/ui/main.qml
	plasma/desktop/applets/taskmanager/package/metadata.desktop
	plasma/desktop/applets/taskmanager/plugin/textlabel.h
	plasma/desktop/applets/tasks/CMakeLists.txt
	plasma/desktop/applets/tasks/package/metadata.desktop
	plasma/desktop/applets/tasks/tasks.cpp
	plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
	plasma/generic/applets/activitybar/activitybar.cpp
	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-09-24 11:28:38 +02:00
..
clients Merge branch 'master' into frameworks-scratch 2013-09-24 11:28:38 +02:00
desktops There is no PlasmaCore.Theme 2013-09-05 14:46:39 +02:00
CMakeLists.txt New desktop switcher layout showing previews of the desktops 2013-04-24 11:47:26 +02:00
IconTabBox.qml There is no PlasmaCore.Theme 2013-09-05 14:46:39 +02:00
ShadowedSvgItem.qml Port tabbox to QtQuick 2 2013-08-09 11:47:18 +02:00
tabbox.qml Port tabbox to QtQuick 2 2013-08-09 11:47:18 +02:00