tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kdeconnect-kde/core
History
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
..
backends Merge branch 'master' into ssl 2015-09-11 17:25:23 +02:00
CMakeLists.txt Merge branch 'master' into ssl 2015-09-11 17:25:23 +02:00
core_debug.h Fix various krazy2 warnings 2015-08-21 22:38:54 +06:00
daemon.cpp Merge branch 'master' into ssl 2015-09-11 17:25:23 +02:00
daemon.h Merge branch 'master' into ssl 2015-09-11 17:25:23 +02:00
dbushelper.cpp Fix various krazy2 warnings 2015-08-21 22:38:54 +06:00
dbushelper.h Fix various krazy2 warnings 2015-08-21 22:38:54 +06:00
device.cpp Merge branch 'master' into ssl 2015-09-11 17:25:23 +02:00
device.h Merge branch 'master' into ssl 2015-09-11 17:25:23 +02:00
filetransferjob.cpp Merge branch 'stable' 2015-09-11 17:03:57 +02:00
filetransferjob.h Add a test for file sending, using the loopback device 2015-09-07 15:03:04 +02:00
kdeconnectconfig.cpp Merge branch 'master' into ssl 2015-08-25 03:43:41 +05:30
kdeconnectconfig.h Pairing handler implemented 2015-07-27 20:58:58 +05:30
kdeconnectplugin.cpp Merge branch 'stable' 2015-09-08 10:51:41 +02:00
kdeconnectplugin.h Added a baseclass for the plugins' KCMs and a class for the plugins' config 2015-03-13 21:22:21 -07:00
kdeconnectpluginconfig.cpp Fixed broken compilation :/ 2015-03-23 20:44:09 -07:00
kdeconnectpluginconfig.h Use C++ for setting the default argument 2015-09-11 12:34:52 +02:00
Messages.sh Figure out Messages.sh after code refactoring 2014-06-17 18:45:47 +02:00
networkpackage.cpp Merge branch 'master' into ssl 2015-09-11 17:25:23 +02:00
networkpackage.h Use C++ for setting the default argument 2015-09-11 12:34:52 +02:00
networkpackagetypes.h Add a package type that updates the device capabilities 2015-09-07 20:03:05 +02:00
pluginloader.cpp Less verbose plugin loader 2015-09-11 01:12:34 -07:00
pluginloader.h Remove unneeded KService include 2015-04-10 17:47:54 +02:00