[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=555e3d8

The following commit has been merged in the master branch:
commit 555e3d807882c3b2afeded6cd9410da7adf62bb6
Merge: 4d734c04ac25f2ce3c6ea4e943dfee912f20ac57 e3dd5c79a83b099153605ed7f938f7846bc79ca1
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 15:23:53 2011 +0100

    Merge branch 'port-to-0.9'
    
    BUG:288543

 CMakeLists.txt                       |  2 +-
 account-button.cpp                   |  4 ++--
 account-button.h                     |  4 ++--
 account-buttons-panel.cpp            |  6 ++---
 account-buttons-panel.h              |  2 +-
 avatar-button.h                      |  2 +-
 cmake/modules/FindTelepathyQt4.cmake | 43 ------------------------------------
 dialogs/add-contact-dialog.cpp       |  6 ++---
 dialogs/add-contact-dialog.h         |  2 +-
 dialogs/contact-info.cpp             |  4 ++--
 dialogs/contact-info.h               |  2 +-
 dialogs/custom-presence-dialog.cpp   |  2 +-
 dialogs/join-chat-room-dialog.cpp    |  2 +-
 dialogs/join-chat-room-dialog.h      |  2 +-
 dialogs/remove-contact-dialog.cpp    |  2 +-
 dialogs/remove-contact-dialog.h      |  2 +-
 fetch-avatar-job.h                   |  2 +-
 global-presence-chooser.cpp          |  4 ++--
 global-presence-chooser.h            |  2 +-
 main-widget.cpp                      | 16 +++++++-------
 main-widget.h                        |  2 +-
 main.cpp                             |  4 ++--
 22 files changed, 37 insertions(+), 80 deletions(-)

-- 
ktp-contact-list packaging