Aleix Pol
|
5e0a7a34b9
|
Merge branch 'master' into ssl
# Conflicts:
# cli/kdeconnect-cli.cpp
# core/backends/lan/landevicelink.cpp
# core/backends/lan/landevicelink.h
# core/backends/lan/lanlinkprovider.cpp
# core/backends/lan/lanlinkprovider.h
# core/backends/lan/socketlinereader.h
# core/backends/lan/uploadjob.cpp
# core/backends/lan/uploadjob.h
# core/backends/loopback/loopbackdevicelink.h
# core/daemon.cpp
# core/daemon.h
# core/device.cpp
# core/device.h
|
2015-09-11 17:25:23 +02:00 |
|
Aleix Pol
|
d58f6314fe
|
run Clang Modernize
Minus the auto change
|
2015-09-08 10:47:37 +02:00 |
|
Vineet Garg
|
b6b5257ba4
|
Added ssl support in download job
|
2015-07-06 03:19:58 +05:30 |
|
Aleix Pol
|
b88897847b
|
Reorganize sources
We broke kded into core and kded, core contains the library with the backends
and plugins.
Also we renamed libkdeconnect to interfaces.
|
2014-06-14 15:22:40 +02:00 |
|