kdeconnect-kde/kio
Aleix Pol 21ab5a4f81 Merge branch 'master' into frameworks
Mostly kDebug -> qCDebug
Also some KCmdLineArgs -> QCommandLineParser

Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	core/backends/lan/lanlinkprovider.cpp
	core/daemon.cpp
	core/pluginloader.cpp
	interfaces/CMakeLists.txt
	kio/kiokdeconnect.cpp
	plugins/mousepad/CMakeLists.txt
	plugins/mousepad/mousepadplugin.h
	plugins/mpriscontrol/mpriscontrolplugin.cpp
	plugins/sftp/sftpplugin.cpp
2014-11-04 19:12:29 +01:00
..
CMakeLists.txt Port KIO free of KDElibs4Support 2014-09-23 19:33:03 +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-11-04 19:12:29 +01:00
kiokdeconnect.h Port the kio from kDebug to qCDebug 2014-09-22 00:20:14 +02:00
Messages.sh Added i18n to kio 2014-01-23 21:00:47 +01:00