Albert Vaca c847c99f5a Merge branch 'master' into 1.x ... # Conflicts: # plugins/findmyphone/kdeconnect_findmyphone.json # plugins/notifications/kdeconnect_notifications.json # plugins/remotecommands/kdeconnect_remotecommands.json # plugins/runcommand/kdeconnect_runcommand.json # plugins/runcommand/kdeconnect_runcommand_config.desktop # plugins/sftp/kdeconnect_sftp.json		2016-10-18 13:14:22 +02:00
..
CMakeLists.txt	Find my phone plugin	2015-09-11 21:12:12 +02:00
findmyphoneplugin.cpp	More unused includes cleanup	2016-07-05 14:27:53 +02:00
findmyphoneplugin.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00
kdeconnect_findmyphone.json	Merge branch 'master' into 1.x	2016-10-18 13:14:22 +02:00