kdeconnect-kde/core/backends/lan
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 Reorganize sources 2014-06-14 15:22:40 +02:00
downloadjob.cpp Reorganize sources 2014-06-14 15:22:40 +02:00
downloadjob.h Reorganize sources 2014-06-14 15:22:40 +02:00
landevicelink.cpp Remove kdebugnamespace completely and replace by core_debug 2014-09-22 00:59:34 +02:00
landevicelink.h Reorganize sources 2014-06-14 15:22:40 +02:00
lanlinkprovider.cpp Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
lanlinkprovider.h Reorganize sources 2014-06-14 15:22:40 +02:00
netaddress.h Reorganize sources 2014-06-14 15:22:40 +02:00
socketlinereader.cpp Removed unused variable 2014-06-14 16:22:30 +02:00
socketlinereader.h Reorganize sources 2014-06-14 15:22:40 +02:00
uploadjob.cpp Remove kdebugnamespace completely and replace by core_debug 2014-09-22 00:59:34 +02:00
uploadjob.h Reorganize sources 2014-06-14 15:22:40 +02:00