l10n daemon script f6724de704 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"		2016-02-14 09:18:22 +00:00
..
CMakeLists.txt	Fix typo in library existing check	2015-09-12 11:11:43 +02:00
kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-14 09:18:22 +00:00
kdeconnectd.cpp	Telepathy integration	2015-09-10 20:36:46 +02:00
kdeconnectd.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-14 09:18:22 +00: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