shift-shell/kcms
l10n daemon script 4101e4ad17 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-03-14 02:32:23 +00:00
..
cellularnetwork SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-14 02:32:23 +00:00
info SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-14 02:32:23 +00:00
mobileshell metadata: port to KPackageStructure 2023-03-07 00:52:30 +01:00
powermanagement SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-14 02:32:23 +00:00
time SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-14 02:32:23 +00:00
virtualkeyboard SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-14 02:32:23 +00:00
CMakeLists.txt kcms: Move KCMs from plasma-settings 2023-03-13 18:45:47 -07:00