l10n daemon script a558af4dd3 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-01-16 06:40:31 +01:00
..
CMakeLists.txt	CMake cleanup	2020-11-16 12:21:07 +00:00
main.cpp	setWindowIcon: add fallback window icons	2020-11-11 17:28:37 +05:30
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-01-16 06:40:31 +01:00