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	Make it possible to lock the screen from KDE Connect	2015-07-22 03:37:34 +02:00
kdeconnect_lockdevice.json	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
lockdeviceplugin.cpp	Reduce API exposed through dbus	2017-01-10 18:15:01 +01:00
lockdeviceplugin.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
org.freedesktop.ScreenSaver.xml	Make it possible to lock the screen from KDE Connect	2015-07-22 03:37:34 +02:00