[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=120f141

The following commit has been merged in the master branch:
commit 120f1419125d4a2907d976aac3195925d1dfb189
Merge: 0dd957b1e2b8eb4e08913361869694f21be76b79 ac3c92a2d4828b14432cf512050262eed6a69875
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 15:20:44 2011 +0100

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

 CMakeLists.txt                       |  2 +-
 cmake/modules/FindTelepathyQt4.cmake | 43 ------------------------------------
 src/config.h                         |  2 +-
 src/contact-wrapper.cpp              | 10 ++++-----
 src/contact-wrapper.h                |  4 ++--
 src/telepathy-contact.cpp            | 10 ++++-----
 src/telepathy-contact.h              |  4 ++--
 7 files changed, 16 insertions(+), 59 deletions(-)

-- 
ktp-contact-applet packaging