shift-shell/kcms/virtualkeyboard
l10n daemon script 38e235b1b0 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-04-11 03:11:36 +00:00
..
package/contents/ui kcms: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07:00
CMakeLists.txt kcms: port to new KCMUtils KCM classes 2023-03-19 17:15:25 +00:00
gsettingsitem.cpp kcms: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07:00
gsettingsitem.h kcms: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07:00
kcm_mobile_onscreenkeyboard.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-11 03:11:36 +00:00
languagemodel.cpp kcms: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07:00
languagemodel.h kcms: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07:00
Messages.sh kcms: Ensure reuse headers exist 2023-03-13 19:09:23 -07:00
virtualkeyboard.cpp kcms: port to new KCMUtils KCM classes 2023-03-19 17:15:25 +00:00
virtualkeyboard.h kcms: port to new KCMUtils KCM classes 2023-03-19 17:15:25 +00:00