shift-shell/applets
l10n daemon script 59f61325a7 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-06-05 05:05:54 +02:00
..
activities SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-05 05:05:54 +02:00
clock SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-05 05:05:54 +02:00
krunner SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-05 05:05:54 +02:00
CMakeLists.txt new applet to access KRunner functions 2020-02-05 19:57:44 +01:00