[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=1e19abb

The following commit has been merged in the master branch:
commit 1e19abb7515a51abebedaad921f2ca3de4071dda
Merge: 6e41f2736406e88e439c39fb0b296830de32d208 50dfa653e9254bfa8cc2aa8bc7ef9fffef541a63
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Nov 13 13:41:33 2014 +0100

    Merge branch 'frameworks'

 CMakeLists.txt                      | 94 +++++++++++++++----------------------
 abstract-contact-delegate.cpp       | 22 ++++-----
 abstract-contact-delegate.h         |  2 +-
 account-button.cpp                  | 47 ++++++++++---------
 cmake/modules/COPYING-CMAKE-SCRIPTS | 22 ---------
 cmake/modules/FindKTp.cmake         | 40 ----------------
 contact-delegate-compact.cpp        | 25 +++++-----
 contact-delegate.cpp                | 16 +++----
 contact-list-application.cpp        | 38 ---------------
 contact-list-application.h          | 41 ----------------
 contact-list-widget.cpp             | 24 +++++-----
 contact-overlays.cpp                |  2 +-
 contact-view-hover-button.cpp       |  4 +-
 contact-view-hover-button.h         |  4 +-
 context-menu.cpp                    | 52 ++++++++++----------
 dialogs/custom-presence-dialog.cpp  | 30 ++++++------
 dialogs/custom-presence-dialog.h    |  4 --
 dialogs/remove-contact-dialog.cpp   |  8 ++--
 filter-bar.cpp                      |  5 +-
 global-presence-chooser.cpp         | 20 ++++----
 ktp-contactlist.desktop             |  1 +
 main-widget.cpp                     | 69 +++++++++++++--------------
 main-widget.h                       | 27 ++++++-----
 main.cpp                            | 43 ++++++++++-------
 tooltips/contacttooltip.cpp         |  4 +-
 tooltips/ktooltip.cpp               |  4 +-
 tooltips/ktooltipwindow.cpp         |  2 +-
 tooltips/persontooltip.cpp          |  8 ++--
 tooltips/tooltipmanager.cpp         |  1 -
 29 files changed, 249 insertions(+), 410 deletions(-)

-- 
ktp-contact-list packaging