l10n daemon script 57ea28a216 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-11-14 05:58:20 +01:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-06 05:53:30 +01:00
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-14 05:58:20 +01:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-04 06:13:10 +01:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00