Albert Vaca a303b73238 Merge branch 'master' into frameworks ... Conflicts: cli/kdeconnect-cli.cpp core/CMakeLists.txt plasmoid/package/contents/ui/FullRepresentation.qml plugins/ping/pingplugin.cpp		2014-07-01 23:59:38 +02:00
..
CMakeLists.txt	Merge branch 'master' into frameworks	2014-07-01 23:59:38 +02:00
kdeconnect.protocol	New icon by Malcer <malcer@gmx.com>	2014-02-19 21:10:41 +01:00
kiokdeconnect.cpp	Merge branch 'master' into frameworks	2014-07-01 23:59:38 +02:00
kiokdeconnect.h	First approach to a KF5 port of KDE Connect	2014-06-16 20:02:07 +02:00
Messages.sh	Added i18n to kio	2014-01-23 21:00:47 +01:00