shift-shell/kcms
l10n daemon script bd287571e8 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"
2025-03-16 01:30:57 +00:00
..
info SVN_SILENT made messages (.desktop file) - always resolve ours 2025-03-16 01:30:57 +00:00
mobileshell SVN_SILENT made messages (.desktop file) - always resolve ours 2025-03-16 01:30:57 +00:00
time SVN_SILENT made messages (.desktop file) - always resolve ours 2025-03-16 01:30:57 +00:00
virtualkeyboard SVN_SILENT made messages (.desktop file) - always resolve ours 2025-03-16 01:30:57 +00:00
CMakeLists.txt kcms/powermanagement: Move to powerdevil 2025-03-05 17:16:04 +00:00