l10n daemon script 80d6283e59 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"		2021-09-26 02:12:50 +00:00
..
CMakeLists.txt	icons: add qrc for device status icons	2021-06-02 00:02:35 +00:00
main.cpp	Set breeze as fallback icon theme for all executables	2021-07-27 23:04:20 +02:00
Messages.sh	Move settings app into own folder and make it a KDBusService	2020-01-17 01:32:56 +01:00
org.kde.kdeconnect.settings.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-26 02:12:50 +00:00