kdeconnect-kde/plugins
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
..
battery Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
clipboard Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
mousepad Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
mpriscontrol Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
notifications Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
pausemusic Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
ping Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
sftp Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
share Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
telephony Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
CMakeLists.txt Port to new QCA cmake structure, now it's called Qca 2014-09-23 20:05:22 +02:00
kdeconnect_plugin.desktop SVN_SILENT made messages (.desktop file) 2014-11-02 04:01:28 +00:00
Messages.sh Figure out Messages.sh after code refactoring 2014-06-17 18:45:47 +02:00