l10n daemon script 1a40632fbc 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-12-21 06:45:06 +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	Trim trailing whitespace	2020-11-28 11:01:47 +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	2020-09-30 06:16:48 +02:00
krunner-integration	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-21 06:45:06 +01:00
nightcolor	Introduce ColorManager component	2020-12-13 23:53:33 +02:00
platforms	Merge OutputScreens into Screens	2020-12-17 13:36:30 +00:00
qpa	Remove fixqopengl.h	2020-12-10 12:00:20 +02:00
scenes	scene: Fix window pixmap traversal order	2020-12-14 12:55:55 +00: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