[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=dae88e8

The following commit has been merged in the master branch:
commit dae88e868574b179b420b4411f53901ed50d1e4c
Merge: ef84a2a21edacb94c490c383a2ec934cedf0c6f7 3917b32f18a861355e2c6038c511218b78038c3c
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 14:55:29 2011 +0100

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

 CMakeLists.txt                       |  2 +-
 cmake/modules/FindTelepathyQt4.cmake | 43 ------------------------------------
 src/approverdaemon.cpp               |  4 ++--
 src/approverdaemon.h                 |  2 +-
 src/channelapprover.cpp              |  4 ++--
 src/channelapprover.h                |  2 +-
 src/dispatchoperation.cpp            |  2 +-
 src/dispatchoperation.h              |  2 +-
 src/filetransferchannelapprover.cpp  |  4 ++--
 src/filetransferchannelapprover.h    |  2 +-
 src/handlewithcaller.cpp             | 10 ++++-----
 src/handlewithcaller.h               |  2 +-
 src/textchannelapprover.cpp          |  8 +++----
 src/textchannelapprover.h            |  4 ++--
 src/tpkdeapprovermodule.cpp          | 12 +++++-----
 15 files changed, 30 insertions(+), 73 deletions(-)

-- 
ktp-approver packaging