[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=47dd023

The following commit has been merged in the master branch:
commit 47dd02364c0379b7889ffc98f95594c62fb3cc89
Merge: 0548eea589e2c2bf992a59f87932e4affcff60b0 dfcaf0b3ccb0b16b04c19fe96dda660e6d698638
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Mar 4 12:33:34 2013 +0000

    Merge branch 'fixed_pinned_contacts_model'
    
    REVIEW: 109267
    BUG: 315485

 KTp/CMakeLists.txt                          |   2 +
 KTp/Declarative/pinned-contacts-model.cpp   | 251 +++++++++++++---------------
 KTp/Declarative/pinned-contacts-model.h     |  18 +-
 KTp/Declarative/telepathy-text-observer.cpp |   1 +
 KTp/persistent-contact.cpp                  | 115 +++++++++++++
 KTp/persistent-contact.h                    |  73 ++++++++
 6 files changed, 319 insertions(+), 141 deletions(-)

-- 
ktp-common-internals packaging