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

The following commit has been merged in the master branch:
commit c6e24ddbfb366b191183da0a0700b372e7bd35bb
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Jan 14 19:46:17 2012 +1100

    Fixing #includes in conversation-target.cpp.
---
 KTp/Declarative/conversation-target.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index 2d6e844..f3b600b 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -18,9 +18,8 @@
 
 #include "conversation-target.h"
 #include <TelepathyQt/AvatarData>
-#include <TelepathyQt/Presence>
 #include <KDebug>
-#include <KIconLoader>
+#include <KTp/presence.h>
 
 class  ConversationTarget::ConversationTargetPrivate
 {

-- 
ktp-common-internals packaging