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
..
qml	Change how we specify devices	2017-05-18 11:45:28 +02:00
CMakeLists.txt	Add desktop file for kcapp	2015-06-13 20:35:09 +02:00
main.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
org.kde.kdeconnect.app.desktop	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
resources.qrc	Improve how we handle the different plugin pages	2016-08-21 13:05:43 +02:00