Albert Vaca ef0e80c91f Merge branch 'master' into 1.x ... # Conflicts: # indicator/org.kde.kdeconnect.nonplasma.desktop # org.kde.kdeconnect.kcm.appdata.xml # plugins/runcommand/kdeconnect_runcommand.json # urlhandler/org.kde.kdeconnect.telhandler.desktop		2017-07-24 16:49:06 +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	Let the menu actually do things	2016-11-23 19:45:35 +01:00
main.cpp	Don't block the process while showing the dialog	2017-05-25 00:16:05 +02:00
org.kde.kdeconnect.nonplasma.desktop	Merge branch 'master' into 1.x	2017-07-24 16:49:06 +02:00