[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=6c3d596

The following commit has been merged in the master branch:
commit 6c3d59666c8040bb556bc3af60c79d6545263faf
Merge: 768e1be70f790d06e0041713bdf28618763cfe0c bd6c54218537dc730dcee68aae679eaf9640f522
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 6 18:18:53 2013 +0000

    Merge branch 'fix_message_proc'
    
    REVIEW: 108720
    REVIEW: 108649

 KTp/CMakeLists.txt                   |  1 +
 KTp/Declarative/conversation.cpp     |  2 +-
 KTp/Declarative/messages-model.cpp   | 18 +++++++---
 KTp/Declarative/messages-model.h     |  7 ++--
 KTp/abstract-message-filter.cpp      | 13 ++-----
 KTp/abstract-message-filter.h        | 20 +++++------
 KTp/message-backslash-filter.cpp     |  3 +-
 KTp/{debug.h => message-context.cpp} | 45 ++++++++++++++---------
 KTp/{debug.h => message-context.h}   | 45 ++++++++++++++---------
 KTp/message-escape-filter.cpp        |  3 +-
 KTp/message-filters-private.h        |  6 ++--
 KTp/message-processor.cpp            | 31 ++++++++++------
 KTp/message-processor.h              |  9 +++--
 KTp/message-url-filter.cpp           |  3 +-
 KTp/message.cpp                      | 70 +++++++++++++++++++++++++-----------
 KTp/message.h                        | 34 +++++++++++++-----
 16 files changed, 199 insertions(+), 111 deletions(-)

-- 
ktp-common-internals packaging