l10n daemon script e15004ff98 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"		2020-07-28 06:11:46 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00
kglobalaccel
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-28 06:11:46 +02:00
qpa	Clean #if version check blocks	2020-05-28 11:43:29 +00:00
scenes	screencasting: Expose necessary information to implement efficient screencasting	2020-07-23 13:14:22 +02:00
windowsystem	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
CMakeLists.txt