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	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
devicetest.cpp	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
kdeconnectconfigtest.cpp	Added KdeConnectConfigTest, TestSslSocketLineReader, LanLinkProviderTest	2015-08-12 23:42:27 +05:30
lanlinkprovidertest.cpp	Fixed code identation issue	2015-08-12 23:49:15 +05:30
networkpackagetests.cpp	Use C++ for setting the default argument	2015-09-11 12:34:52 +02:00
networkpackagetests.h	Type was missing for identity packages	2013-09-03 02:14:55 +02:00
pluginloadtest.cpp	Fix tests	2015-09-09 20:12:05 +02:00
sendfiletest.cpp	Fix tests	2015-09-09 20:12:05 +02:00
testsocketlinereader.cpp	Merge branch 'master' into ssl	2015-09-11 17:25:23 +02:00
testsslsocketlinereader.cpp	Added KdeConnectConfigTest, TestSslSocketLineReader, LanLinkProviderTest	2015-08-12 23:42:27 +05:30