[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=37a9d7e

The following commit has been merged in the master branch:
commit 37a9d7e1c4d317b142994dcdb36f83243730538d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Nov 25 16:44:11 2013 +0100

    Update includes for kpeople2
---
 main-widget.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 74d55e9..93574d9 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -62,9 +62,8 @@
 #include <KWindowSystem>
 
 #ifdef HAVE_KPEOPLE
-#include <kpeople/widgets/mergedialog.h>
+// #include <kpeople/widgets/mergedialog.h> //Disable for now, re-enable when kpeople re-enables it
 #include <KPeople/PersonsModel>
-#include <KPeople/PersonsModelFeature>
 #endif
 
 #include "ui_main-widget.h"

-- 
ktp-contact-list packaging