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	Add icon to executable for Windows and Mac	2017-05-24 22:57:37 +02:00
deviceindicator.cpp	Get the correct icon	2017-05-24 22:57:36 +02:00
deviceindicator.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
main.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
org.kde.kdeconnect.nonplasma.desktop	Merge branch 'master' into 1.x	2017-09-03 22:05:54 +02:00