l10n daemon script 2f6e9a6355 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-03-27 06:43:00 +01:00
..
idletime	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kdecorations	Fix compiler warnings	2020-03-17 15:07:52 +01:00
kglobalaccel	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-27 06:43:00 +01:00
platforms	Fix build with Qt 5.12, Qt::hex and Qt::endl	2020-03-17 15:57:11 +01:00
qpa	Update my email address	2020-01-14 18:17:18 +02:00
scenes	Merge branch 'Plasma/5.18'	2020-03-19 16:41:09 +02: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