kdeconnect-kde/plasmoid
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
..
declarativeplugin fix the Configure action 2014-09-10 10:19:44 +02:00
package Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
CMakeLists.txt Streamline internal naming (kdeconnect → org.kde.kdeconnect) 2014-08-26 01:37:35 +02:00
Messages.sh i18n fixes 2014-09-08 03:09:18 +02:00