kdeconnect-kde/kcm
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 kcm free of KDELibs4Support 2014-09-22 09:35:40 +02:00
devicessortproxymodel.cpp Removed unused kdebugnamespace, makes kcm kDebug free 2014-09-22 00:17:56 +02:00
devicessortproxymodel.h Minor changes 2014-08-11 18:57:48 +02:00
kcm.cpp Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
kcm.h Added a refresh button to KCM, just in case. 2014-08-11 18:57:49 +02:00
kcm.ui Added a refresh button to KCM, just in case. 2014-08-11 18:57:49 +02:00
kcm_kdeconnect.desktop Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
kdeconnect.desktop Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
Messages.sh i18n 2013-09-04 21:19:02 +02:00