[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=e6fd4f9

The following commit has been merged in the master branch:
commit e6fd4f99159cfd49429cbeb9f2e75f69e9abc2ea
Merge: fb801ba32182b2a98b8a64f3084754c7e7eb14b7 4771490e69f990ead249fc104b186728a644c06b
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 15:39:29 2011 +0100

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

 CMakeLists.txt                       |  2 +-
 app/chat-tab.cpp                     |  4 ++--
 app/chat-window.cpp                  |  8 +++----
 app/main.cpp                         | 12 +++++-----
 app/telepathy-chat-ui.cpp            |  8 +++----
 app/telepathy-chat-ui.h              |  2 +-
 cmake/modules/FindTelepathyQt4.cmake | 43 ------------------------------------
 lib/channel-contact-model.h          | 10 ++++-----
 lib/chat-widget.cpp                  | 12 +++++-----
 lib/chat-widget.h                    |  2 +-
 lib/logmanager.cpp                   |  8 +++----
 lib/logmanager.h                     |  6 ++---
 12 files changed, 37 insertions(+), 80 deletions(-)

-- 
ktp-text-ui packaging