[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=559ad8d

The following commit has been merged in the master branch:
commit 559ad8d09136ba6828be2e26188649155022979c
Merge: 83b1ac025f946c1ef4e7437d04487f49ee0ae06a 1ddf4342b8b55e425ae966f7798017c08e148563
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 14:33:25 2011 +0100

    Merge branch 'port-to-0.9'

 CMakeLists.txt                               |   2 +-
 KTelepathy/Models/accounts-model-item.cpp    |   6 +-
 KTelepathy/Models/accounts-model-item.h      |   8 +-
 KTelepathy/Models/accounts-model.cpp         |   6 +-
 KTelepathy/Models/accounts-model.h           |  10 +-
 KTelepathy/Models/contact-model-item.cpp     |  10 +-
 KTelepathy/Models/contact-model-item.h       |   4 +-
 KTelepathy/Models/groups-model-item.cpp      |   6 +-
 KTelepathy/Models/groups-model-item.h        |   8 +-
 KTelepathy/Models/groups-model.cpp           |   8 +-
 KTelepathy/Models/groups-model.h             |  10 +-
 KTelepathy/Models/proxy-tree-node.cpp        |   2 +-
 KTelepathy/Models/tree-node.cpp              |   2 +-
 KTelepathy/Models/tree-node.h                |   2 +-
 KTelepathy/error-dictionary.cpp              | 198 +++++++++++++--------------
 KTelepathy/global-presence.cpp               |   4 +-
 KTelepathy/global-presence.h                 |   4 +-
 KTelepathy/presence.h                        |   2 +-
 KTelepathy/telepathy-handler-application.cpp |   4 +-
 KTelepathy/wallet-interface.h                |   2 +-
 cmake/modules/FindTelepathyQt4.cmake         |  43 ------
 21 files changed, 149 insertions(+), 192 deletions(-)

-- 
ktp-common-internals packaging