[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=5ed2e39

The following commit has been merged in the master branch:
commit 5ed2e39053cc213c6b2bbaeadc66450ed3575a05
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Nov 12 03:44:38 2011 +1100

    Idk why, but changing the order of inheritance seemes to have fixed those issues.
---
 KTp/Declarative/telepathy-text-observer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Declarative/telepathy-text-observer.h b/KTp/Declarative/telepathy-text-observer.h
index 927441a..40a7be2 100644
--- a/KTp/Declarative/telepathy-text-observer.h
+++ b/KTp/Declarative/telepathy-text-observer.h
@@ -25,7 +25,7 @@
 
 class Conversation;
 
-class ConversationWatcher : public Tp::AbstractClientObserver , public QObject
+class ConversationWatcher : public QObject, public Tp::AbstractClientObserver 
 {
 Q_OBJECT
 

-- 
ktp-common-internals packaging