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 |
|
Albert Vaca
|
0271aa9511
|
Ping plugin packet type define shouldn't be in core.
|
2014-12-21 19:35:35 -08:00 |
|
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 |
|
Albert Vaca
|
f41fb4de2a
|
Customizable ping messages.
|
2014-09-26 20:39:38 -07:00 |
|
Àlex Fiestas
|
d971269bd5
|
Remove kdebugnamespace completely and replace by core_debug
In those places that belong to "core" we use core_debug, in any other
place we have added custom logging categories so we use those instead.
|
2014-09-22 00:59:34 +02:00 |
|
Àlex Fiestas
|
cfe23bfc22
|
Port ping away from kDebug
|
2014-09-22 00:45:41 +02:00 |
|
Aleix Pol
|
c8dbbed685
|
Move the send ping code to the ping plugin
turn it into a dbus call to the plugin
Reviewed by Albert Vaca
|
2014-06-27 18:21:40 +02:00 |
|
Aleix Pol
|
741abafaf7
|
Move the plugins into a different top-ĺevel directory
Reviewed by Albert Vaca
|
2014-06-14 16:34:11 +02:00 |
|