[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=d96572f

The following commit has been merged in the master branch:
commit d96572fa77dab23a65fe862ae7e857dc13493c35
Merge: 503276549a22974956579a4696123c835d0cd79e 6b67a7c494fe965213fb974d32606beba62da9d7
Author: George Kiagiadakis <george.kiagiadakis at collabora.co.uk>
Date:   Mon Feb 7 23:57:46 2011 +0200

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

 CMakeLists.txt              |   2 +-
 src/approverdaemon.cpp      |   6 ++-
 src/approverdaemon.h        |   3 +-
 src/textchannelapprover.cpp | 100 ++++++++++++++------------------------------
 src/textchannelapprover.h   |  22 +---------
 5 files changed, 39 insertions(+), 94 deletions(-)

-- 
ktp-approver packaging