[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=434976e

The following commit has been merged in the master branch:
commit 434976effb0bb428d1443af1e0f0ae7f1143326a
Merge: 6e4c2463bf34845efa185edc521791af950b3c3c 74ff8720970ab8b7baf7279675e47720a441da18
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Dec 21 19:18:39 2011 +0100

    Merge branch 'resume_filetransfer'
    
    Reviewed-by: Dario Freddi <dario.freddi at collabora.com>
    REVIEW: 103466
    FEATURE: 283004
    BUG: 283003

 src/handle-incoming-file-transfer-channel-job.cpp | 325 ++++++++++++++++------
 src/handle-incoming-file-transfer-channel-job.h   |   9 +-
 src/handle-outgoing-file-transfer-channel-job.cpp |  67 +++--
 src/handle-outgoing-file-transfer-channel-job.h   |   4 +-
 4 files changed, 288 insertions(+), 117 deletions(-)

-- 
ktp-filetransfer-handler packaging