kwin/kcmkwin
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
..
kwincompositing fixuifiles 2014-12-08 11:50:20 +01:00
kwindecoration fixuifiles 2014-12-10 12:05:43 +01:00
kwindesktop SVN_SILENT made messages (.desktop file) 2014-11-06 09:38:04 +00:00
kwinoptions SVN_SILENT made messages (.desktop file) 2014-11-06 09:38:04 +00:00
kwinrules SVN_SILENT made messages (.desktop file) 2014-11-06 09:38:04 +00:00
kwinscreenedges Merge branch 'Plasma/5.1' 2014-12-10 13:52:27 +01:00
kwinscripts Correcting Exec command in kwinscripts.desktop 2014-10-29 11:45:57 +01:00
kwintabbox [kcmkwin/tabbox] Find all layouts in lnf package 2014-11-24 10:39:26 +01:00
CMakeLists.txt Drop build option KWIN_BUILD_SCREENEDGES 2014-11-24 10:48:49 +01:00