[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=6e4c246

The following commit has been merged in the master branch:
commit 6e4c2463bf34845efa185edc521791af950b3c3c
Merge: c6bc75f1e59d6d4120b2875bd4e4c62faede141b d8a10d5e0b93c9e49d1ebf69e6238abbd674002f
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 15:33:45 2011 +0100

    Merge branch 'port-to-0.9'
    
    BUG:288544

 CMakeLists.txt                                    |  3 +-
 cmake/modules/FindTelepathyQt4.cmake              | 43 -----------------------
 src/filetransfer-handler.cpp                      |  8 ++---
 src/filetransfer-handler.h                        |  4 +--
 src/handle-incoming-file-transfer-channel-job.cpp |  8 ++---
 src/handle-incoming-file-transfer-channel-job.h   |  4 +--
 src/handle-outgoing-file-transfer-channel-job.cpp |  8 ++---
 src/handle-outgoing-file-transfer-channel-job.h   |  4 +--
 src/main.cpp                                      |  4 +--
 src/telepathy-base-job.cpp                        |  2 +-
 10 files changed, 22 insertions(+), 66 deletions(-)

-- 
ktp-filetransfer-handler packaging