[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=6a88bae

The following commit has been merged in the master branch:
commit 6a88bae99698c93b2f7836105a33932a718149b3
Merge: b9aa6c746e8bf2450be319f3bda3c3444aa4128d 797f2b09afce4c8c4457865271b77d000c1ad1e2
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Sun Apr 24 13:05:45 2011 +0200

    Merge branch 'remove-todo-fixme'
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    
    REVIEW: 101179

 account-button.cpp            | 22 +++++++++--------
 account-button.h              |  2 +-
 account-filter-model.cpp      |  2 ++
 accounts-model-item.cpp       |  7 ++++--
 accounts-model-item.h         |  2 +-
 accounts-model.cpp            |  9 ++++---
 accounts-model.h              |  4 ++--
 add-contact-dialog.cpp        | 22 +++++++++++++++++
 add-contact-dialog.h          | 20 ++++++++++++++++
 add-contact-dialog.ui         |  2 +-
 contact-delegate-overlay.cpp  | 34 +++++++++++++-------------
 contact-delegate-overlay.h    |  2 +-
 contact-delegate.cpp          | 56 ++++++++++++++++++++++++++++++-------------
 contact-delegate.h            | 22 +++++++++++++++++
 contact-model-item.cpp        |  7 ++++--
 contact-model-item.h          |  2 +-
 contact-overlays.cpp          |  8 ++++---
 contact-view-hover-button.cpp |  6 +++--
 contact-view-hover-button.h   |  2 +-
 main-widget.cpp               | 31 ++++++++++++++----------
 main.cpp                      | 28 ----------------------
 remove-contact-dialog.cpp     |  2 ++
 remove-contact-dialog.h       |  2 +-
 tree-node.cpp                 |  6 +++--
 tree-node.h                   |  2 +-
 25 files changed, 193 insertions(+), 109 deletions(-)

-- 
ktp-contact-list packaging