[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=59c1bca

The following commit has been merged in the master branch:
commit 59c1bca9516e2e7ed6295519064f04275db917bc
Merge: e9d573b9a73b6afea1c8a4a39670361fa895a5b0 0bbe76dd826f9569f30c56d595749424e2ad036b
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Wed Jun 8 18:09:59 2011 +0200

    Merge branch 'master' of git.kde.org:/scratch/davidedmundson/telepathy-dolphin
    
    Conflicts:
    	main.cpp
    	mainwindow.cpp

 main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --cc main.cpp
index 71a43dd,5bffcea..d4813f9
--- a/main.cpp
+++ b/main.cpp
@@@ -3,10 -3,9 +3,12 @@@
  #include <KApplication>
  #include <KAboutData>
  #include <KLocale>
 +#include <KUrl>
 +
 +#include <QDebug>
  
+ #include <QDebug>
+ 
  #include "mainwindow.h"
  
  int main(int argc, char *argv[])

-- 
ktp-send-file packaging