[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=d49d8d4

The following commit has been merged in the master branch:
commit d49d8d4784a8a2f241c743cf3abca872cfb4abce
Merge: 83eaf6a9325a0e983d32a983466777470939d0fe d6355ab0ce71400c2a45d67ca90e2145966d341a
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Sep 29 11:01:02 2016 +0200

    Merge branch '1.x'
    
    # Conflicts:
    #	plugins/telephony/kdeconnect_telephony.json

 plugins/battery/kdeconnect_battery.json            |  4 +--
 plugins/clipboard/kdeconnect_clipboard.json        |  2 +-
 plugins/findmyphone/kdeconnect_findmyphone.json    |  2 +-
 plugins/lockdevice/kdeconnect_lockdevice.json      |  2 +-
 plugins/mousepad/kdeconnect_mousepad.json          |  2 +-
 plugins/mousepad/mousepadplugin.cpp                | 39 ++++++++++++++++------
 plugins/mpriscontrol/kdeconnect_mpriscontrol.json  |  4 +--
 plugins/mprisremote/kdeconnect_mprisremote.json    |  2 +-
 .../notifications/kdeconnect_notifications.json    |  2 +-
 plugins/pausemusic/kdeconnect_pausemusic.json      |  4 +--
 plugins/ping/kdeconnect_ping.json                  |  2 +-
 .../remotecommands/kdeconnect_remotecommands.json  |  7 ++--
 .../remotecontrol/kdeconnect_remotecontrol.json    |  6 ++--
 plugins/runcommand/kdeconnect_runcommand.json      |  8 +----
 .../kdeconnect_screensaver_inhibit.json            |  6 ++--
 .../kdeconnect_sendnotifications.json              |  4 +--
 .../kdeconnect_sendnotifications_config.desktop    |  2 +-
 plugins/sftp/kdeconnect_sftp.json                  |  6 ++--
 plugins/share/kdeconnect_share.json                |  2 +-
 plugins/telephony/kdeconnect_telephony.json        |  6 ++--
 20 files changed, 62 insertions(+), 50 deletions(-)

-- 
kdeconnect packaging