[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=6007bac

The following commit has been merged in the master branch:
commit 6007bac3580a08c46fefa21f4abe49bc0fbbe76f
Merge: d592c28a75a4c0a62899812c8adf05f274784bd6 0c38df0d0d28aca095c6db501de3ab69060da3f6
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 17 21:30:37 2014 +0100

    Merge branch 'kde-telepathy-0.7'

 CMakeLists.txt                                    |  2 +-
 src/handle-incoming-file-transfer-channel-job.cpp |  6 +++---
 src/handle-outgoing-file-transfer-channel-job.cpp |  6 +++---
 src/telepathy-base-job.cpp                        | 23 +++++++++++++++++++++++
 src/telepathy-base-job.h                          |  2 ++
 src/telepathy-base-job_p.h                        |  3 +++
 6 files changed, 35 insertions(+), 7 deletions(-)

-- 
ktp-filetransfer-handler packaging