kwin/clients/aurorae/src
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
..
lib KGlobal::config() -> KSharedConfig::openConfig() 2013-09-04 16:11:40 +02:00
qml Suppress animation in Aurorae on creation 2013-01-23 07:37:25 +01:00
aurorae.cpp Add properties for keepAbove/Below to KDecoration 2013-09-12 09:27:39 +02:00
aurorae.desktop SVN_SILENT made messages (.desktop file) 2013-05-02 09:17:01 +02:00
aurorae.h Add properties for keepAbove/Below to KDecoration 2013-09-12 09:27:39 +02:00
aurorae.knsrc Aurorae uses KNS3 configuration file. 2010-04-23 16:45:11 +00:00
CMakeLists.txt Port from KGlobalSettings::contrastF to KColorScheme::contrastF 2013-09-04 16:35:16 +02:00
colorhelper.cpp Port from KGlobalSettings::contrastF to KColorScheme::contrastF 2013-09-04 16:35:16 +02:00
colorhelper.h Mark most ctors as explicit as reported by Krazy2 checker 2013-01-02 18:35:46 +01:00
decorationoptions.cpp Introduce a dedicated borders element in Aurorae 2013-01-23 07:36:41 +01:00
decorationoptions.h Use uppercase Q_SLOTS/Q_SIGNALS in Aurorae 2013-07-25 17:59:30 +02:00
decorationplugin.cpp explicitly compare latin1 strings in qassert (fixes build with debugfull) 2013-08-07 09:25:27 +02:00
decorationplugin.h Use Q_PLUGIN_METADATA for Aurorae's deco QML plugins 2013-07-25 18:00:27 +02:00
kwindecoration.desktop SVN_SILENT made messages (.desktop file) 2013-08-13 04:19:10 +00:00