l10n daemon script 430ca2a33e 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"		2020-06-18 08:32:20 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:32:20 +02:00
kglobalaccel
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:32:20 +02:00
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:32:20 +02:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:32:20 +02:00
windowsystem
CMakeLists.txt