Albert Vaca a58fab4fb3 Merge branch 'master' into frameworks ... Conflicts: cli/kdeconnect-cli.cpp core/device.cpp core/filetransferjob.cpp core/filetransferjob.h core/networkpackage.h kded/CMakeLists.txt plugins/share/shareplugin.cpp plugins/telephony/telephonyplugin.cpp		2014-11-11 21:40:54 -08:00
..
lan	Merge branch 'master' into frameworks	2014-11-11 21:40:54 -08:00
loopback	Remove kdebugnamespace completely and replace by core_debug	2014-09-22 00:59:34 +02:00
devicelink.cpp	Minor changes	2014-10-10 11:47:35 -07:00
devicelink.h	Reorganize sources	2014-06-14 15:22:40 +02:00
linkprovider.cpp	Reorganize sources	2014-06-14 15:22:40 +02:00
linkprovider.h	Minor changes	2014-10-10 11:47:35 -07:00