shift-shell/kcms
l10n daemon script 2f53c54157 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-05-21 02:19:12 +00:00
..
cellularnetwork Fix more cases of Kirigami.Action iconName 2023-05-12 18:48:34 -04:00
hotspot SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
info SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-21 02:19:12 +00:00
mobileshell SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-21 02:19:12 +00:00
powermanagement SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-08 02:24:47 +00:00
time SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-21 02:19:12 +00:00
virtualkeyboard SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-09 02:28:58 +00:00
wifi SVN_SILENT made messages (.desktop file) - always resolve ours 2023-05-21 02:19:12 +00:00
CMakeLists.txt kcms: Import mobile network kcms 2023-03-14 14:31:27 +00:00