l10n daemon script 85bc931d72 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"		2018-10-05 05:58:38 +02:00
..
idletime
kdecorations	Revert "Workaround crash in Aurorae destruction"	2018-06-24 13:28:23 +01:00
kglobalaccel
platforms	[platforms/virtual] Set raw physical size of outputs	2018-08-31 13:22:55 +02:00
qpa	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-05 05:58:38 +02:00
CMakeLists.txt