l10n daemon script 057a114629 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-09-19 04:58:52 +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-09-19 04:58:52 +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-09-19 04:58:52 +02:00
Messages.sh	Fully replaced KDED for autostart + dbus activation, so we work outside KDE	2015-02-23 22:12:45 -08:00
org.kde.kdeconnect.service.in	Make sure kdeconnectd gets started when required	2015-09-10 20:21:41 +02:00