shift-shell/kded
l10n daemon script 2eb495a66b 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-02-28 02:08:53 +00:00
..
CMakeLists.txt kded: Add startup settings manager 2023-02-23 16:43:38 +00:00
config.h kded: Add startup settings manager 2023-02-23 16:43:38 +00:00
kded_plasma-mobile-start.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-02-28 02:08:53 +00:00
settings.cpp kded: Add startup settings manager 2023-02-23 16:43:38 +00:00
settings.h kded: Add startup settings manager 2023-02-23 16:43:38 +00:00
startdaemon.cpp kded: Add startup settings manager 2023-02-23 16:43:38 +00:00
startdaemon.h kded: Add startup settings manager 2023-02-23 16:43:38 +00:00
utils.h kded: Add startup settings manager 2023-02-23 16:43:38 +00:00