Martin Gräßlin 5ceb1b4f75 Merge branch 'Plasma/5.1' ... Conflicts: CMakeLists.txt geometry.cpp kcmkwin/kwincompositing/kcmkwineffects.desktop kcmkwin/kwincompositing/kwincompositing.desktop kcmkwin/kwindecoration/kwindecoration.desktop kcmkwin/kwindesktop/desktop.desktop kcmkwin/kwinoptions/kwinactions.desktop kcmkwin/kwinoptions/kwinadvanced.desktop kcmkwin/kwinoptions/kwinfocus.desktop kcmkwin/kwinoptions/kwinmoving.desktop kcmkwin/kwinoptions/kwinoptions.desktop kcmkwin/kwinrules/kwinrules.desktop kcmkwin/kwinscreenedges/kwinscreenedges.desktop kcmkwin/kwintabbox/kwintabbox.desktop scripts/enforcedeco/metadata.desktop		2014-12-10 13:52:27 +01:00
..
CMakeLists.txt	[kcmscreenedges] Call reconfigureEffect on save	2014-05-16 07:38:01 +02:00
kwinscreenedges.desktop	SVN_SILENT made messages (.desktop file)	2014-11-06 09:38:04 +00:00
main.cpp	[kcmkwin/screenedges] Drop check whether Compositing is enabled	2014-12-10 13:49:07 +01:00
main.h	[kcmkwin/screenedges] Use BuiltInEffects to find the Desktop Effects	2014-04-28 13:51:30 +02:00
main.ui	Drop KDE4Support in kde-workspace/kwin	2013-12-05 20:24:02 +01:00
Messages.sh
monitor.cpp	Remove KDE/ prefix in include directories	2014-03-17 16:24:10 +01:00
monitor.h	Welcome back KWin screen edges KCM	2013-09-29 10:27:48 +02:00
screenpreviewwidget.cpp	[kwin] Mark unused variables as unused	2014-02-03 11:36:21 +01:00
screenpreviewwidget.h	Make the ScreenPreviewWidget useable again	2013-09-29 10:27:48 +02:00