l10n daemon script cf2791803f 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"		2019-10-31 05:34:18 +01:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 05:33:32 +02:00
kglobalaccel
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 05:33:32 +02:00
platforms	Merge branch 'Plasma/5.17'	2019-10-22 11:29:03 +02:00
qpa	Don't use MESA_EGL_NO_X11_HEADERS	2019-10-21 22:18:30 +03:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-31 05:34:18 +01:00
windowsystem
CMakeLists.txt