[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=9f00c49

The following commit has been merged in the master branch:
commit 9f00c49f2ed62370f83a58b5ea7cdd9b7f91e455
Merge: d96572fa77dab23a65fe862ae7e857dc13493c35 951af45f823eee1b13def389d6c8f43898dcbbd1
Author: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
Date:   Mon Feb 7 23:58:52 2011 +0200

    Merge branch 'config'
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>

 src/CMakeLists.txt                                 |  1 +
 src/handlewithcaller.cpp                           | 46 +++++++++++++++++++++-
 src/handlewithcaller.h                             |  1 +
 src/telepathy_kde_approverrc                       |  2 +
 src/textchannelapprover.cpp                        |  4 +-
 ...{channelapprover.cpp => tpkdeapproverfactory.h} | 18 +++------
 src/tpkdeapprovermodule.cpp                        |  4 +-
 7 files changed, 58 insertions(+), 18 deletions(-)

-- 
ktp-approver packaging