Albert Vaca 6b94e7faf8 Merge branch 'qmlsftp' ... Conflicts: kded/daemon.cpp		2014-02-14 13:07:52 +01:00
..
CMakeLists.txt	qDebug -> kDebug with namespaces	2013-11-06 22:16:55 +01:00
devicessortproxymodel.cpp	qDebug -> kDebug with namespaces	2013-11-06 22:16:55 +01:00
devicessortproxymodel.h	Changed generic license headers	2013-08-16 06:23:54 +02:00
kcm.cpp	Code cleaning and stabilization	2014-01-15 20:36:01 +04:00
kcm.h	dirty kcm integration	2014-01-07 01:01:21 +04:00
kcm.ui	dirty kcm integration	2014-01-07 01:01:21 +04:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file)	2014-02-01 04:09:05 +00:00
kdebugnamespace.cpp	qDebug -> kDebug with namespaces	2013-11-06 22:16:55 +01:00
kdebugnamespace.h	qDebug -> kDebug with namespaces	2013-11-06 22:16:55 +01:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00