kdeconnect-kde/core
Albert Vaca 84bba9429f Merge branch 'master' into 1.x
# Conflicts:
#	core/backends/lan/downloadjob.cpp
#	core/backends/lan/downloadjob.h
#	core/filetransferjob.cpp
#	core/filetransferjob.h
#	plugins/notifications/sendreplydialog.cpp
#	plugins/notifications/sendreplydialog.h
#	plugins/telephony/sendsmsdialog.cpp
#	plugins/telephony/sendsmsdialog.h
2017-09-03 22:05:54 +02:00
..
backends Merge branch 'master' into 1.x 2017-09-03 22:05:54 +02:00
CMakeLists.txt Make Bluetooth optional 2017-05-24 23:54:59 +02:00
core_debug.cpp Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
core_debug.h Added debug function to print a stack trace 2016-06-01 12:43:34 +02:00
daemon.cpp Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
daemon.h Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
dbushelper.cpp Clazy says all this QStringLiteral and QLatin1String were missing/wrong 2016-11-26 16:21:29 +01:00
dbushelper.h Fix various krazy2 warnings 2015-08-21 22:38:54 +06:00
device.cpp Merge branch 'master' into 1.x 2017-09-03 22:05:54 +02:00
device.h Merge branch 'master' into 1.x 2017-09-03 22:05:54 +02:00
filetransferjob.cpp Merge branch 'master' into 1.x 2017-09-03 22:05:54 +02:00
filetransferjob.h Merge branch 'master' into 1.x 2017-09-03 22:05:54 +02:00
kdeconnectconfig.cpp Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
kdeconnectconfig.h Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
kdeconnectplugin.cpp Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
kdeconnectplugin.h Reduce API exposed through dbus 2017-01-10 18:15:01 +01:00
kdeconnectpluginconfig.cpp Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
kdeconnectpluginconfig.h Do not use a location under home as mount point 2017-02-18 16:14:51 +01:00
Messages.sh Figure out Messages.sh after code refactoring 2014-06-17 18:45:47 +02:00
networkpackage.cpp Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
networkpackage.h Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
networkpackagetypes.h Clazy says all this QStringLiteral and QLatin1String were missing/wrong 2016-11-26 16:21:29 +01:00
pluginloader.cpp Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00
pluginloader.h Make member variable names, & placement and * placement more coherent 2017-09-03 21:45:08 +02:00