shift-shell/kwin
l10n daemon script 6fe1c74947 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"
2023-03-17 02:54:12 +00:00
..
mobiletaskswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-17 02:54:12 +00:00
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-16 02:34:43 +00:00
CMakeLists.txt taskswitcher: Port to kwin effect 2023-03-13 22:07:32 -07:00