tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kdeconnect-kde/core
History
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
..
backends Merge branch 'master' into frameworks 2014-11-11 21:40:54 -08:00
CMakeLists.txt Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
core_debug.h Remove kdebugnamespace completely and replace by core_debug 2014-09-22 00:59:34 +02:00
daemon.cpp turn critical debugs into qCCritical() 2014-11-10 15:53:01 +01:00
daemon.h First approach to a KF5 port of KDE Connect 2014-06-16 20:02:07 +02:00
dbushelper.cpp Minor changes 2014-10-10 11:47:35 -07:00
dbushelper.h More robust fix to problem with device ids being non exportable on dbus 2014-10-10 11:26:50 -07:00
default_args.h Removed commented code 2014-10-10 11:27:01 -07:00
device.cpp Merge branch 'master' into frameworks 2014-11-11 21:40:54 -08:00
device.h Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
filetransferjob.cpp Merge branch 'master' into frameworks 2014-11-11 21:40:54 -08:00
filetransferjob.h Merge branch 'master' into frameworks 2014-11-11 21:40:54 -08:00
kdeconnectplugin.cpp Remove kdebugnamespace completely and replace by core_debug 2014-09-22 00:59:34 +02:00
kdeconnectplugin.h Make kdeconnect core compile without KDELibs4Support 2014-09-22 02:40:51 +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 frameworks 2014-11-04 19:12:29 +01:00
networkpackage.h Merge branch 'master' into frameworks 2014-11-11 21:40:54 -08:00
networkpackagetypes.h Reorganize sources 2014-06-14 15:22:40 +02:00
pluginloader.cpp Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
pluginloader.h Use the incoming/outgoing capabilities for trimming loaded plugins 2014-07-11 01:54:19 +02:00