l10n daemon script ba4e932ccd 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-03-20 03:33:42 +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	[KCM] Remove extra margins on standalone settings	2022-02-28 21:46:11 +01: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-03-20 03:33:42 +00:00