[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=b355acb

The following commit has been merged in the master branch:
commit b355acb9b3ebb65bce88c3f7e87156d6bb02b61e
Merge: b821be46bcf1cff101056574380a96981f637578 21ea3181364bbddf8a8aaa42cba984a16e5a4324
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Thu Dec 22 16:53:43 2011 +0100

    Merge branch 'rename-fury'
    
    REVIEW:103491

 CMakeLists.txt                                     |  8 +++----
 {KTelepathy => KTp}/CMakeLists.txt                 | 26 +++++++++++-----------
 {KTelepathy => KTp}/Models/CMakeLists.txt          | 26 +++++++++++-----------
 .../Models/accounts-filter-model.cpp               |  0
 {KTelepathy => KTp}/Models/accounts-filter-model.h |  4 ++--
 {KTelepathy => KTp}/Models/accounts-model-item.cpp |  0
 {KTelepathy => KTp}/Models/accounts-model-item.h   |  6 ++---
 {KTelepathy => KTp}/Models/accounts-model.cpp      |  0
 {KTelepathy => KTp}/Models/accounts-model.h        |  4 ++--
 {KTelepathy => KTp}/Models/contact-model-item.cpp  |  0
 {KTelepathy => KTp}/Models/contact-model-item.h    |  6 ++---
 {KTelepathy => KTp}/Models/groups-model-item.cpp   |  0
 {KTelepathy => KTp}/Models/groups-model-item.h     |  6 ++---
 {KTelepathy => KTp}/Models/groups-model.cpp        |  2 +-
 {KTelepathy => KTp}/Models/groups-model.h          |  4 ++--
 {KTelepathy => KTp}/Models/proxy-tree-node.cpp     |  0
 {KTelepathy => KTp}/Models/proxy-tree-node.h       |  6 ++---
 {KTelepathy => KTp}/Models/tree-node.cpp           |  0
 {KTelepathy => KTp}/Models/tree-node.h             |  4 ++--
 {KTelepathy => KTp}/circular-countdown.cpp         |  0
 {KTelepathy => KTp}/circular-countdown.h           |  4 ++--
 {KTelepathy => KTp}/error-dictionary.cpp           |  0
 {KTelepathy => KTp}/error-dictionary.h             |  6 ++---
 {KTelepathy => KTp}/global-presence.cpp            |  0
 {KTelepathy => KTp}/global-presence.h              |  4 ++--
 KTelepathy/ktelepathy-export.h => KTp/ktp-export.h | 16 ++++++-------
 {KTelepathy => KTp}/presence.cpp                   |  0
 {KTelepathy => KTp}/presence.h                     |  4 ++--
 .../service-availability-checker.cpp               |  0
 {KTelepathy => KTp}/service-availability-checker.h |  4 ++--
 .../telepathy-handler-application.cpp              |  0
 .../telepathy-handler-application.h                |  4 ++--
 {KTelepathy => KTp}/text-parser.cpp                |  0
 {KTelepathy => KTp}/text-parser.h                  |  6 ++---
 {KTelepathy => KTp}/wallet-interface.cpp           |  0
 {KTelepathy => KTp}/wallet-interface.h             |  4 ++--
 Messages.sh                                        |  2 +-
 37 files changed, 78 insertions(+), 78 deletions(-)

-- 
ktp-common-internals packaging