shift-shell/kcms
l10n daemon script 9f420519b1 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-02-04 02:10:12 +00:00
..
mobileshell SVN_SILENT made messages (.desktop file) - always resolve ours 2023-02-04 02:10:12 +00:00
CMakeLists.txt navigationpanel: Add ability to toggle between gesture only and shown navigation panel modes 2022-02-13 04:23:57 +00:00