l10n daemon script 59b1dee55a 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"		2021-01-17 06:42:32 +01:00
..
colord-integration	Introduce ColorManager component	2020-12-13 23:53:33 +02:00
idletime	Consistently name some KF5 integration plugins	2020-11-23 16:44:42 +00:00
kdecorations	aurorae: Make direct connection to maximizedChanged signal	2021-01-15 13:26:49 +00:00
kglobalaccel	Consistently name some KF5 integration plugins	2020-11-23 16:44:42 +00:00
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
krunner-integration	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-17 06:42:32 +01:00
nightcolor	plugins/nightcolor: Handle new color devices	2020-12-21 20:43:17 +02:00
platforms	Minor whitespace fixes	2021-01-14 11:40:22 +02:00
qpa	cmake: Clean up CMakeLists.txt for QPA plugin	2021-01-07 09:49:54 +00:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
screencast	Port wayland code away from factory methods in KWaylandServer::Display	2020-12-14 13:05:47 +00:00
windowsystem	Consistently name some KF5 integration plugins	2020-11-23 16:44:42 +00:00
CMakeLists.txt	Introduce ColorManager component	2020-12-13 23:53:33 +02:00