Aleix Pol 5e0a7a34b9 Merge branch 'master' into ssl ... # Conflicts: # cli/kdeconnect-cli.cpp # core/backends/lan/landevicelink.cpp # core/backends/lan/landevicelink.h # core/backends/lan/lanlinkprovider.cpp # core/backends/lan/lanlinkprovider.h # core/backends/lan/socketlinereader.h # core/backends/lan/uploadjob.cpp # core/backends/lan/uploadjob.h # core/backends/loopback/loopbackdevicelink.h # core/daemon.cpp # core/daemon.h # core/device.cpp # core/device.h		2015-09-11 17:25:23 +02:00
..
CMakeLists.txt	Removed reference to KDED	2015-02-23 22:14:22 -08:00
loopbackdevicelink.cpp	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
loopbackdevicelink.h	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
loopbacklinkprovider.cpp	run Clang Modernize	2015-09-08 10:47:37 +02:00
loopbacklinkprovider.h	Merge branch 'stable'	2015-09-08 10:51:41 +02:00