l10n daemon script 84426e8082 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-09-10 01:18:40 +00:00
..
colord-integration
idletime
kdecorations
kglobalaccel
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-10 01:18:40 +00:00
krunner-integration
nightcolor
platforms	platforms/drm: improve warning messages in DrmPipeline	2021-09-09 19:52:01 +00:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-08 01:27:17 +00:00
screencast	screencast/pipewire: Add TODO marks for extending modifier capabilities	2021-09-03 17:49:37 +00:00
windowsystem
CMakeLists.txt