l10n daemon script cab72500b5 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-12-10 09:23:03 +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-10-23 09:01:14 +02:00
kglobalaccel	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-10 09:23:03 +01:00
platforms	Fix non-atomic output init	2019-10-22 11:28:08 +02:00
qpa	Don't use MESA_EGL_NO_X11_HEADERS	2019-10-24 18:57:30 +03:00
scenes	Use lambdas for queued invocation of composition suspending	2019-09-26 16:09:16 +01:00
windowsystem	fix compilation with no-deprecated build of kwindowsystem	2019-11-24 22:43:54 +01:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00