kwin/kcmkwin/kwindecoration
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
..
qml Support for Application Menu in Aurorae 2013-01-07 09:43:30 +01:00
auroraeconfig.ui
buttons.cpp s/KLocale/KLocalizedString/g 2013-03-07 13:59:15 +01:00
buttons.h Mark most ctors as explicit as reported by Krazy2 checker 2013-01-02 18:35:46 +01:00
buttons.ui
buttonsconfigdialog.cpp Use mgraesslin@kde.org for my mail address in Copyright and AboutData 2013-03-12 13:17:53 +01:00
buttonsconfigdialog.h Use mgraesslin@kde.org for my mail address in Copyright and AboutData 2013-03-12 13:17:53 +01:00
CMakeLists.txt
config.ui
configdialog.cpp Use mgraesslin@kde.org for my mail address in Copyright and AboutData 2013-03-12 13:17:53 +01:00
configdialog.h Use mgraesslin@kde.org for my mail address in Copyright and AboutData 2013-03-12 13:17:53 +01:00
decoration.ui
decorationmodel.cpp Porting kcmkwin to Qt5/KF5: QStandardPaths 2013-08-13 17:55:49 -03:00
decorationmodel.h Use mgraesslin@kde.org for my mail address in Copyright and AboutData 2013-03-12 13:17:53 +01:00
kwindecoration.cpp Porting kcmkwin to Qt5/KF5: QStandardPaths 2013-08-13 17:55:49 -03:00
kwindecoration.desktop SVN_SILENT made messages (.desktop file) 2013-08-13 04:19:10 +00:00
kwindecoration.h Use mgraesslin@kde.org for my mail address in Copyright and AboutData 2013-03-12 13:17:53 +01:00
Messages.sh
pixmaps.h
preview.cpp remove moveResizeMaximized option 2013-03-24 22:26:48 +01:00
preview.h remove moveResizeMaximized option 2013-03-24 22:26:48 +01:00