shift-shell/kcms
l10n daemon script f00a1baae9 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-13 02:33:38 +00:00
..
cellularnetwork SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-13 02:33:38 +00:00
hotspot SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-13 02:33:38 +00:00
info SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-13 02:33:38 +00:00
mobileshell kcms: port to new KCMUtils KCM classes 2023-03-19 17:15:25 +00:00
powermanagement SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-13 02:33:38 +00:00
time SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-13 02:33:38 +00:00
virtualkeyboard SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-13 02:33:38 +00:00
wifi SVN_SILENT made messages (.desktop file) - always resolve ours 2023-04-13 02:33:38 +00:00
CMakeLists.txt kcms: Import mobile network kcms 2023-03-14 14:31:27 +00:00