l10n daemon script b56a28e19c 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-14 09:23:44 +00:00
..
idletime
kdecorations
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-14 09:23:44 +00:00
qpa
CMakeLists.txt