kwin/kcmkwin
Martin Gräßlin f750fef8b7 Merge branch 'Plasma/5.1'
Conflicts:
	CMakeLists.txt
	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-10-28 15:03:15 +01:00
..
kwincompositing Merge branch 'Plasma/5.1' 2014-10-28 15:03:15 +01:00
kwindecoration SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:48 +00:00
kwindesktop SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:48 +00:00
kwinoptions SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:48 +00:00
kwinrules SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:48 +00:00
kwinscreenedges SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:48 +00:00
kwinscripts SVN_SILENT made messages (.desktop file) 2014-10-25 09:39:36 +00:00
kwintabbox SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:48 +00:00
CMakeLists.txt [kwincompositing] Integrate the new kcmkwin subdirectory into build tree 2014-04-03 07:23:17 +02:00