l10n daemon script bba776a5fb 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"		2024-01-05 02:08:21 +00:00
..
mobiletaskswitcher	kwin/mobiletaskswitcher: Ensure that touch borders are registered	2023-12-28 15:24:35 -05:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-01-05 02:08:21 +00:00
CMakeLists.txt	taskswitcher: Port to kwin effect	2023-03-13 22:07:32 -07:00