l10n daemon script f0445b20e2 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-10-01 05:17:39 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-28 04:30:46 +02:00
kglobalaccel
platforms	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-10-01 05:17:39 +02:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00