Albert Vaca 6124e5273f Merge branch 'master' (early part) into 1.x ... # Conflicts: # plugins/kdeconnect.notifyrc # plugins/remotecommands/kdeconnect_remotecommands.json # plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop # plugins/telephony/kdeconnect_telephony.json		2016-11-23 17:29:26 +01: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' (early part) into 1.x	2016-11-23 17:29:26 +01:00