l10n daemon script 889beb8a53 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"		2022-06-13 02:25:53 +00:00
..
CMakeLists.txt	Use undeprecated install dirs	2022-04-21 00:50:14 +02:00
main.cpp	Enable highdpi for all executables	2022-04-02 14:32:54 +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	2022-06-13 02:25:53 +00:00