l10n daemon script 78c0095a5d 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-02-11 05:59:16 +01:00
..
idletime	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-11 05:59:16 +01:00
kglobalaccel	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
kpackage	Update my email address	2020-01-14 18:17:18 +02:00
platforms	ScreenEdge: Do not use localtime for measuring duration	2020-02-03 12:26:17 +01:00
qpa	Update my email address	2020-01-14 18:17:18 +02:00
scenes	Merge branch 'Plasma/5.18'	2020-01-29 13:11:32 +02:00
windowsystem	Provide a KWindowShadow implementation for internal clients	2020-01-22 02:21:36 +02:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00