l10n daemon script a518a4d53b 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"		2022-04-16 01:46:47 +00:00
..
colord-integration	Rename AbstractOutput to Output	2022-04-15 17:49:49 +03:00
idletime	Run clang-format	2022-03-25 13:25:15 +02:00
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-01 02:01:13 +00:00
kglobalaccel	Run clang-format	2022-03-25 13:25:15 +02:00
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-16 01:46:47 +00:00
krunner-integration	Run clang-format	2022-03-25 13:25:15 +02:00
nightcolor	Remove input processing functions in Platform	2022-04-14 17:29:51 +03:00
qpa	Rename AbstractOutput to Output	2022-04-15 17:49:49 +03:00
screencast	Rename AbstractOutput to Output	2022-04-15 17:49:49 +03:00
windowsystem	Run clang-format	2022-03-25 13:25:15 +02:00
CMakeLists.txt	Move scenes to the src directory	2021-11-08 10:22:07 +00:00