l10n daemon script 873a51cc62 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"		2017-04-20 04:17:52 +02:00
..
kwincompositing
kwindecoration	Merge branch 'Plasma/5.8' into Plasma/5.9	2017-04-13 11:55:52 +01:00
kwindesktop
kwinoptions
kwinrules
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-20 04:17:52 +02:00
kwinscripts
kwintabbox
CMakeLists.txt