l10n daemon script 2bb025cbdb 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-11-02 05:41:14 +01:00
..
idletime	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
kglobalaccel	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01: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	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00