l10n daemon script 71c3f063bb 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-10-23 09:01:14 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
kglobalaccel
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:01:14 +02:00
platforms	Fix non-atomic output init	2019-10-22 11:28:08 +02:00
qpa
scenes
windowsystem
CMakeLists.txt