kdeconnect-kde/cli
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
..
CMakeLists.txt Port kdeconnect-cli away from kdelibs4supposrt 2014-09-22 02:26:06 +02:00
kdeconnect-cli.cpp Merge branch 'master' into frameworks 2014-11-11 21:40:54 -08:00
Messages.sh Translated sendfileitemaction and the CLI 2014-06-17 22:21:58 +02:00