[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=12c2636

The following commit has been merged in the master branch:
commit 12c2636804c05f7c91febf0aa53f866f741bfd2e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 1 16:56:25 2013 +0000

    Update includes
---
 abstract-contact-delegate.cpp | 2 +-
 contact-list-widget.cpp       | 3 +--
 context-menu.cpp              | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index e49eba3..d90c93d 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -32,7 +32,7 @@
 #include <KDE/KIconLoader>
 #include <KDE/KIcon>
 
-#include <KTp/type.h>
+#include <KTp/types.h>
 #include <KDebug>
 
 const int SPACING = 2;
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 2e2f259..9bde744 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -25,10 +25,9 @@
 #include <TelepathyQt/PendingChannelRequest>
 #include <TelepathyQt/PendingReady>
 
-#include <KTp/Models/contacts-model.h>
+#include <KTp/types.h>
 #include <KTp/Models/contacts-list-model.h>
 
-#include <KTp/Models/groups-model.h>
 #include <KTp/Models/accounts-filter-model.h>
 #include <KTp/Models/accounts-tree-proxy-model.h>
 #include <KTp/Models/groups-tree-proxy-model.h>
diff --git a/context-menu.cpp b/context-menu.cpp
index 52605a3..af4cb5d 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -29,6 +29,7 @@
 #include <KMessageBox>
 #include <KAction>
 
+
 #include <KTp/text-parser.h>
 #include <KTp/Widgets/notificationconfigdialog.h>
 #include <KTp/contact-info-dialog.h>

-- 
ktp-contact-list packaging