l10n daemon script 30b516eceb 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-09-30 06:16:48 +02:00
..
idletime	Prettify license headers	2020-08-07 19:57:56 +00:00
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kglobalaccel	Prettify license headers	2020-08-07 19:57:56 +00:00
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
qpa	qpa: Expose output names to QScreen	2020-09-23 06:36:31 +00:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
windowsystem	plugins/windowsystem: Adjust installation path	2020-09-01 22:44:11 +03:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00