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	Initial working implementation of ssl	2015-07-05 18:53:53 +05:30
downloadjob.cpp	Merge branch 'master' into 1.x	2017-09-03 22:05:54 +02:00
downloadjob.h	Merge branch 'master' into 1.x	2017-09-03 22:05:54 +02:00
landevicelink.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
landevicelink.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
lanlinkprovider.cpp	Merge branch 'master' into 1.x	2017-09-03 22:05:54 +02:00
lanlinkprovider.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
lanpairinghandler.cpp	Fix warning because of missing enum value in switch	2017-02-18 15:32:55 +01:00
lanpairinghandler.h	Missing Q_OBJECT macro	2016-11-26 16:36:34 +01:00
server.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
server.h	More unused includes cleanup	2016-07-05 14:27:53 +02:00
socketlinereader.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
socketlinereader.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
uploadjob.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
uploadjob.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00