Albert Vaca 0c95010c3b Merge branch 'master' into sslrefactor ... # Conflicts: # core/device.cpp # interfaces/devicesmodel.cpp		2016-04-14 19:00:42 -07: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	Display the device name, not the link name	2016-02-12 08:00:05 -08: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