l10n daemon script fb7f507d8e 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-02-10 08:21:09 +01:00
..
colord-integration	GIT_SILENT: dont use deprecated cmake variable	2021-01-29 11:34:52 +01:00
idletime	Consistently name some KF5 integration plugins	2020-11-23 16:44:42 +00:00
kdecorations	GIT_SILENT: don't use deprecated cmake variable	2021-02-08 20:19:33 +01: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-02-10 08:21:09 +01:00
nightcolor	GIT_SILENT: don't use deprecated cmake variable	2021-02-08 20:19:33 +01:00
platforms	Fix hotplugging for VR headsets	2021-02-06 10:54:44 +00:00
qpa	Use versionless Qt cmake target	2021-01-30 17:18:21 +01:00
scenes	Fixes for direct scanout	2021-02-02 16:19:30 +01:00
screencast	Implement direct scanout for the gbm backend	2021-02-02 13:26:43 +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