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
..
code	Use Qt5:: in target link libraries in KWin	2013-08-20 09:14:24 +02:00
package	Merge branch 'KDE/4.11'	2013-08-21 21:55:29 +02:00
CMakeLists.txt	Port of Plastik decoration to QML	2012-08-26 20:56:19 +02:00