l10n daemon script aa009cfd85 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"		2024-06-09 01:17:55 +00:00
..
CMakeLists.txt	Cleanup all occurences of QT_MAJOR_VERSION in cmake	2023-12-28 17:49:07 +01:00
main.cpp	Drop Qt5-only code branches	2024-04-27 17:46:39 +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	2024-06-09 01:17:55 +00:00