l10n daemon script b0c8db667e 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-04-07 01:42:30 +00:00
..
CMakeLists.txt	[settings] Rename desktop file to match desktop entry defined by KAboutData	2021-12-25 21:47:41 +01: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-04-07 01:42:30 +00:00