l10n daemon script a1a6341158 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-01-25 07:33:24 +01:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-25 07:33:24 +01:00
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-23 07:41:21 +01:00
qpa	[plugins/qpa] support use of modularized qtplatformsupport from Qt 5.8	2016-10-28 21:12:48 +09:00
CMakeLists.txt