4 commits

Author	SHA1	Message	Date
Albert Vaca	cf6cbd2925	WIPx3!	2015-12-01 10:45:14 -08:00
Albert Vaca	82bc73dd9b	WIPx2	2015-12-01 07:25:34 -08:00
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
Vineet Garg	9799c629d2	Added device test	2015-08-20 23:15:12 +05:30