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	Implement the touchpad forwarding into kcapp	2015-07-22 03:21:28 +02:00
kdeconnect_remotecontrol.json	Merge branch 'master' into 1.x	2016-10-18 13:14:22 +02: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