Albert Vaca c7c1974ea9 Merge branch 'master' into frameworks ... Conflicts: core/backends/lan/lanlinkprovider.cpp plugins/ping/pingplugin.h plugins/telephony/telephonyplugin.cpp		2015-01-10 20:14:01 -08:00
..
lan	Merge branch 'master' into frameworks	2015-01-10 20:14:01 -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	Fixing memory leaks in LanDeviceLinkProvider and LanDeviceLink	2015-01-06 21:48:25 -08:00
linkprovider.cpp	Reorganize sources	2014-06-14 15:22:40 +02:00
linkprovider.h	Fixing memory leaks in LanDeviceLinkProvider and LanDeviceLink	2015-01-06 21:48:25 -08:00