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

The following commit has been merged in the master branch:
commit a1e4e38500e66e096fdfb69d4ebe57616656200e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 15 23:53:47 2013 +0000

    Tidy include order
---
 CMakeLists.txt                      | 2 ++
 KTp/Widgets/contact-grid-dialog.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2a5b89..de94874 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(ktp-common-internals)
 
+cmake_minimum_required (VERSION 2.6.3 FATAL_ERROR)
+
 set (CMAKE_MODULE_PATH
      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
      ${CMAKE_MODULE_PATH}
diff --git a/KTp/Widgets/contact-grid-dialog.cpp b/KTp/Widgets/contact-grid-dialog.cpp
index 5c3eff9..f6eb45b 100644
--- a/KTp/Widgets/contact-grid-dialog.cpp
+++ b/KTp/Widgets/contact-grid-dialog.cpp
@@ -30,13 +30,13 @@
 #include <TelepathyQt/AccountManager>
 #include <TelepathyQt/AccountFactory>
 #include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingChannelRequest>
 
 #include <KTp/debug.h>
 #include <KTp/Models/contacts-list-model.h>
 #include <KTp/Models/contacts-filter-model.h>
 #include <KTp/Widgets/contact-grid-widget.h>
 #include <KTp/contact-factory.h>
-#include <TelepathyQt/PendingChannelRequest>
 
 
 

-- 
ktp-common-internals packaging