[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=96b1454

The following commit has been merged in the master branch:
commit 96b1454c661025cb0cf8cb48921376e79064d607
Merge: 651e7e4c44387e7dcdae77dd59b77d5418821c92 4ec003a6e6f494abc7571293f48cd12b4648b000
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 14:51:14 2011 +0100

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

 CMakeLists.txt                                     |  2 +-
 cmake/modules/FindTelepathyQt4.cmake               | 39 ----------------------
 .../abstract-account-parameters-widget.h           |  2 +-
 src/KCMTelepathyAccounts/abstract-account-ui.h     |  2 +-
 src/KCMTelepathyAccounts/account-edit-widget.cpp   |  2 +-
 src/KCMTelepathyAccounts/account-edit-widget.h     |  2 +-
 src/KCMTelepathyAccounts/parameter-edit-model.cpp  |  4 +--
 src/KCMTelepathyAccounts/parameter-edit-model.h    |  4 +--
 src/KCMTelepathyAccounts/parameter-edit-widget.h   |  2 +-
 src/KCMTelepathyAccounts/parameter-item.h          |  4 +--
 src/KCMTelepathyAccounts/profile-item.cpp          |  2 +-
 src/KCMTelepathyAccounts/profile-item.h            |  2 +-
 src/KCMTelepathyAccounts/profile-list-model.cpp    |  4 +--
 src/KCMTelepathyAccounts/profile-list-model.h      |  4 +--
 src/KCMTelepathyAccounts/profile-select-widget.cpp |  6 ++--
 src/account-item.cpp                               |  4 +--
 src/account-item.h                                 |  2 +-
 src/accounts-list-model.cpp                        |  2 +-
 src/accounts-list-model.h                          |  2 +-
 src/add-account-assistant.cpp                      |  6 ++--
 src/add-account-assistant.h                        |  2 +-
 src/edit-account-dialog.cpp                        |  4 +--
 src/kcm-telepathy-accounts.cpp                     | 12 +++----
 src/kcm-telepathy-accounts.h                       |  2 +-
 src/salut-details-dialog.cpp                       | 12 +++----
 src/salut-details-dialog.h                         |  2 +-
 src/salut-enabler.cpp                              | 12 +++----
 src/salut-enabler.h                                |  2 +-
 28 files changed, 53 insertions(+), 92 deletions(-)

-- 
ktp-accounts-kcm packaging