l10n daemon script 5427754e21 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"		2019-08-01 04:51:32 +02:00
..
qml	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
rpm	More https	2019-03-24 10:42:34 +01:00
CMakeLists.txt	use libkeepalive to wakeup daemon	2018-10-23 08:30:48 +01:00
kdeconnect-sfos.cpp	Build kdeconnect on sailfish and port some simple plugins	2018-08-02 20:10:59 +01:00
kdeconnect-sfos.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-27 05:13:07 +02:00
kdeconnectd.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-01 04:51:32 +02:00
org.kde.kdeconnect.service.in	Build kdeconnect on sailfish and port some simple plugins	2018-08-02 20:10:59 +01:00
sailfishdaemon.cpp	s/Q_NULLPTR/nullptr/	2019-05-05 15:45:50 +02:00