Albert Vaca 84bba9429f Merge branch 'master' into 1.x ... # Conflicts: # core/backends/lan/downloadjob.cpp # core/backends/lan/downloadjob.h # core/filetransferjob.cpp # core/filetransferjob.h # plugins/notifications/sendreplydialog.cpp # plugins/notifications/sendreplydialog.h # plugins/telephony/sendsmsdialog.cpp # plugins/telephony/sendsmsdialog.h		2017-09-03 22:05:54 +02:00
..
CMakeLists.txt	Fixed build on windows	2016-06-09 02:36:02 +02:00
devicetest.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
downloadjobtest.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
kdeconnectconfigtest.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
lanlinkprovidertest.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
networkpackagetests.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
networkpackagetests.h	Merge branch 'master' into sslrefactor	2016-06-01 12:20:07 +02:00
pluginloadtest.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
sendfiletest.cpp	Merge branch 'master' into 1.x	2017-09-03 22:05:54 +02:00
testdaemon.h	Expose pairing state for devices	2017-01-25 00:22:22 +01:00
testnotificationlistener.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
testsocketlinereader.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
testsslsocketlinereader.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00