l10n daemon script 27ba893b75 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"		2019-12-10 05:51:14 +01:00
..
idletime
kdecorations	Fix minor typos	2019-11-26 19:48:29 +02:00
kglobalaccel
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-10 05:51:14 +01:00
platforms	[platforms/drm] Refactor updateTransform	2019-12-01 13:11:16 +01:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-07 05:38:05 +01:00
windowsystem
CMakeLists.txt