shift-shell/applets
l10n daemon script 426b33533a 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"
2020-02-13 05:56:01 +01:00
..
activities Replace plasma.kde.org with kde.org/plasma-desktop 2020-02-10 23:03:44 +01:00
clock Replace plasma.kde.org with kde.org/plasma-desktop 2020-02-10 23:03:44 +01:00
krunner SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-13 05:56:01 +01:00
CMakeLists.txt new applet to access KRunner functions 2020-02-05 19:57:44 +01:00