l10n daemon script aa645e9401 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-09-16 05:08:51 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-28 04:30:46 +02:00
kglobalaccel
platforms	Try fixing build failure on CI	2017-09-12 21:20:18 +02:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-16 05:08:51 +02:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00