l10n daemon script db12cb6742 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"		2019-06-21 05:35:42 +02:00
..
idletime
kdecorations
kglobalaccel
kpackage
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-21 05:35:42 +02:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-21 05:35:42 +02:00
windowsystem
CMakeLists.txt