a58fab4fb3
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 |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
kdeconnect-cli.cpp | ||
Messages.sh |