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
..
bluetooth	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
lan	Merge branch 'master' into 1.x	2017-09-03 22:05:54 +02:00
loopback	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
devicelinereader.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
devicelinereader.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
devicelink.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
devicelink.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
linkprovider.cpp	Reorganize sources	2014-06-14 15:22:40 +02:00
linkprovider.h	Unused include cleanup	2016-07-05 14:13:48 +02:00
pairinghandler.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
pairinghandler.h	Expose pairing state for devices	2017-01-25 00:22:22 +01:00