l10n daemon script 049b34c050 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 04:38:05 +01:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-06 04:38:04 +01:00
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-14 04:38:05 +01:00
qpa	Require Qt 5.9	2017-10-31 12:45:21 +01:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-07 04:44:27 +01:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00