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	Fix compilation on Windows.	2015-09-10 15:51:38 +02:00
kdeconnect-cli.cpp	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
Messages.sh	Translated sendfileitemaction and the CLI	2014-06-17 22:21:58 +02:00