kdeconnect-kde/kded
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 Merge branch 'master' into frameworks 2014-11-11 21:40:54 -08:00
config-kded.h.cmake Set path to kdeconnectd executable through cmake 2014-07-07 18:24:29 +02:00
kdeconnect.desktop Merge branch 'master' into frameworks 2014-11-04 19:12:29 +01:00
kdeconnectd.cpp don't crash on incoming notifications 2014-11-10 15:52:02 +01:00
kded.cpp Make kded compile without KDELibs4Support 2014-09-22 10:08:19 +02:00
kded.h Make kded compile without KDELibs4Support 2014-09-22 10:08:19 +02:00
Messages.sh Figure out Messages.sh after code refactoring 2014-06-17 18:45:47 +02:00