kwin/effects/windowgeometry
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
..
CMakeLists.txt
windowgeometry.cpp Merge branch 'master' into frameworks-scratch 2013-09-24 11:28:38 +02:00
windowgeometry.desktop
windowgeometry.h
windowgeometry.kcfg
windowgeometry_config.cpp Port KWin effects away from KAction and KShortcut to Qt5/KF5 classes. 2013-08-15 04:13:12 +09:00
windowgeometry_config.desktop
windowgeometry_config.h
windowgeometry_config.ui Use KShortcutsEditor directly instead of subclass 2013-09-09 06:57:06 +02:00
windowgeometryconfig.kcfgc