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	Implement the touchpad forwarding into kcapp	2015-07-22 03:21:28 +02:00
kdeconnect_remotecontrol.json	Merge branch 'master' (early part) into 1.x	2016-11-23 17:29:26 +01:00
remotecontrolplugin.cpp	Introduce QVariantMap as an argument of NetworkPackage	2016-06-21 20:07:12 +02:00
remotecontrolplugin.h	Reflect to changes in the json file	2016-06-06 01:21:37 +02:00