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
..
actions.ui
advanced.ui
AUTHORS
ChangeLog
CMakeLists.txt
focus.ui	align initial slider and desscription	2013-07-19 21:19:49 +02:00
kwinactions.desktop	SVN_SILENT made messages (.desktop file)	2013-08-13 04:19:10 +00:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file)	2013-07-31 04:07:19 +00:00
kwinfocus.desktop	SVN_SILENT made messages (.desktop file)	2013-07-31 04:07:19 +00:00
kwinmoving.desktop	SVN_SILENT made messages (.desktop file)	2013-07-01 03:54:58 +00:00
kwinoptions.desktop	SVN_SILENT made messages (.desktop file)	2013-09-09 04:11:16 +00:00
main.cpp	Remove K_EXPORT_PLUGIN macros	2013-08-08 13:47:25 +02:00
main.h
Messages.sh
mouse.cpp
mouse.h
mouse.ui
moving.ui
ox16-app-kcmkwm.png
ox22-app-kcmkwm.png
ox32-app-kcmkwm.png
ox48-app-kcmkwm.png
ox64-app-kcmkwm.png
ox128-app-kcmkwm.png
oxsc-app-kcmkwm.svgz
windows.cpp
windows.h