l10n daemon script 0356908fc8 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"		2017-08-06 04:42:32 +02:00
..
CMakeLists.txt	Move the Telepathy infrastructure at the plugin level	2016-06-18 11:54:38 +02:00
kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-06 04:42:32 +02:00
kdeconnectd.cpp	Merge branch '1.x'	2017-07-12 11:37:41 +02:00
kdeconnectd.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-06 04:42:32 +02:00
Messages.sh
org.kde.kdeconnect.service.in