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
dbus.h	Check max viewport and texture dimensions	2013-01-23 21:27:46 +01:00
interface_util.h
ktimerdialog.cpp	s/KLocale/KLocalizedString/g	2013-03-07 13:59:15 +01:00
ktimerdialog.h
kwincompositing.desktop	SVN_SILENT made messages (.desktop file)	2013-09-09 04:11:16 +00:00
kwineffect.knsrc
main.cpp	Remove K_EXPORT_PLUGIN macros	2013-08-08 13:47:25 +02:00
main.h	Enable color correction check box for the appropriate compositing types	2013-06-24 21:33:12 +03:00
main.ui	kwin: Refactor the UI for compositing type selection	2013-05-08 18:33:01 +02:00
Messages.sh