shift-shell/kcms
l10n daemon script ef88e5a7f2 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"
2026-03-15 01:41:15 +00:00
..
info Remove kirigami version in imports 2026-03-06 22:08:07 -05:00
mobileshell SVN_SILENT made messages (.desktop file) - always resolve ours 2026-03-15 01:41:15 +00:00
navigation SVN_SILENT made messages (.desktop file) - always resolve ours 2026-03-15 01:41:15 +00:00
time Remove kirigami version in imports 2026-03-06 22:08:07 -05:00
waydroidintegration SVN_SILENT made messages (.desktop file) - always resolve ours 2026-03-15 01:41:15 +00:00
CMakeLists.txt Switch from maliit-keyboard to plasma-keyboard 2025-12-04 10:06:21 -05:00