l10n daemon script f556dc721b 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-09-30 01:47:48 +00:00
..
CMakeLists.txt	Fix activating existing settings window on Wayland	2022-07-06 12:55:39 +00:00
kdeconnectd.cpp	Add and make use of ECM's clang-format integration	2022-09-11 23:21:58 +00: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	2022-09-30 01:47:48 +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