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	Initial working implementation of ssl	2015-07-05 18:53:53 +05:30
downloadjob.cpp	Fixed issues pointed out on CR	2015-07-14 17:34:04 +05:30
downloadjob.h	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
landevicelink.cpp	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
landevicelink.h	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
lanlinkprovider.cpp	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
lanlinkprovider.h	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
lanpairinghandler.cpp	Added default value while checking for link name in pairing handler, this provides backward compatibility	2015-08-14 17:33:08 +05:30
lanpairinghandler.h	Pairing handler implemented	2015-07-27 20:58:58 +05:30
netaddress.h	Reorganize sources	2014-06-14 15:22:40 +02:00
server.cpp	Fixed issues pointed out on CR	2015-07-14 17:34:04 +05:30
server.h	Fixed issue pointed out on RR	2015-08-11 09:04:02 +05:30
socketlinereader.cpp	Initial working implementation of ssl	2015-07-05 18:53:53 +05:30
socketlinereader.h	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
uploadjob.cpp	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
uploadjob.h	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00