l10n daemon script e57fd79f26 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"		2020-09-19 06:10:24 +02:00
..
CMakeLists.txt	Replace manual include dir handling with interface target	2020-07-30 10:53:48 +02:00
kdeconnectd.cpp	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +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	2020-09-19 06:10:24 +02:00
org.kde.kdeconnect.service.in	Make sure kdeconnectd gets started when required	2015-09-10 20:21:41 +02:00