l10n daemon script 57ad550181 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2016-09-24 09:51:29 +00:00
..
kwincompositing	[kcmkwin/compositing] Hide config options which don't make sense if Compositing is required	2016-09-13 15:47:42 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-24 09:51:29 +00:00
kwindesktop
kwinoptions
kwinrules
kwinscreenedges
kwinscripts
kwintabbox
CMakeLists.txt