shift-shell/kcms
l10n daemon script 720cb44e05 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-06 01:40:47 +00:00
..
info SVN_SILENT made messages (.desktop file) - always resolve ours 2025-09-09 02:09:50 +00:00
mobileshell kcms: Only show on Plasma Mobile 2025-09-17 15:13:46 -04:00
navigation SVN_SILENT made messages (.desktop file) - always resolve ours 2026-03-06 01:40:47 +00:00
time SVN_SILENT made messages (.desktop file) - always resolve ours 2026-01-29 01:40:16 +00:00
waydroidintegration SVN_SILENT made messages (.desktop file) - always resolve ours 2026-02-01 01:38:53 +00:00
CMakeLists.txt Switch from maliit-keyboard to plasma-keyboard 2025-12-04 10:06:21 -05:00