kdeconnect-kde/fileitemactionplugin
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 fileitemactionplugin free of KDELibs4Support 2014-09-23 19:33:03 +02:00
kdeconnectsendfile.desktop SVN_SILENT made messages (.desktop file) 2014-11-02 04:01:28 +00:00
Messages.sh i18n fixes 2014-09-08 03:09:18 +02:00
sendfileitemaction.cpp Port fileitemactionplugin free of KDELibs4Support 2014-09-23 19:33:03 +02:00
sendfileitemaction.h Port fileitemactionplugin free of KDELibs4Support 2014-09-23 19:33:03 +02:00