l10n daemon script ce5b9c3612 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"		2020-06-11 09:38:33 +02:00
..
idletime	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-11 09:38:33 +02:00
kglobalaccel	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-11 09:38:33 +02:00
platforms	Wayland: avoid binding disabled outputs to surfaces	2020-05-26 17:18:11 +02:00
qpa	Fix warning about using 0 as nullptr	2020-05-01 13:02:20 +02:00
scenes	[scene] Generate window quads for sub-surfaces	2020-05-04 15:36:30 +03:00
windowsystem	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00