l10n daemon script df4030f3fb 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"		2023-11-29 03:05:10 +00:00
..
CMakeLists.txt	Adapt build system to also support Qt 6	2022-10-29 16:51:41 +02:00
kdeconnectd.cpp	clang-format pass	2023-07-16 16:20:34 +02:00
Messages.sh	Do not extract messages from the non-existent .ui and .rc files	2019-12-21 10:04:31 +02:00
org.kde.kdeconnect.daemon.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-11-29 03:05:10 +00:00
org.kde.kdeconnect.service.in	kdeconnect_daemon: conditionally configure the daemon service to better support the windows port	2020-11-10 19:06:30 +05:30