l10n daemon script ccde0558d5 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-12-07 09:52:48 +01:00
..
CMakeLists.txt	append link libraries for daemon in separate lines	2020-10-31 11:31:51 +00:00
kdeconnectd.cpp	Add a verification key that's displayed when pairing	2020-11-26 11:28:32 +01: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-12-07 09:52:48 +01:00
org.kde.kdeconnect.service.in	Make sure kdeconnectd gets started when required	2015-09-10 20:21:41 +02:00