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
..
lan	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
loopback	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
devicelink.cpp	Make sure we don't disconnect from discovering remotes	2015-09-09 13:01:38 +02:00
devicelink.h	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
linkprovider.cpp	Reorganize sources	2014-06-14 15:22:40 +02:00
linkprovider.h	Now per device per link type pairing handlers are there	2015-07-25 17:15:19 +05:30
pairinghandler.cpp	Pairing handler implemented	2015-07-27 20:58:58 +05:30
pairinghandler.h	Fixed issue pointed out on RR	2015-08-11 09:04:02 +05:30