l10n daemon script c6b32908bf 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-04-09 04:07:54 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-28 09:41:02 +02:00
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-09 04:07:54 +02:00
qpa	Require Qt 5.7 and remove pre-5.7 code	2017-02-07 20:43:19 +01:00
CMakeLists.txt