kdeconnect-kde/cli
Albert Vaca a303b73238 Merge branch 'master' into frameworks
Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	plasmoid/package/contents/ui/FullRepresentation.qml
	plugins/ping/pingplugin.cpp
2014-07-01 23:59:38 +02:00
..
CMakeLists.txt Remove usage of KDE4_ variables 2014-06-18 02:39:30 +02:00
kdeconnect-cli.cpp Merge branch 'master' into frameworks 2014-07-01 23:59:38 +02:00
Messages.sh Translated sendfileitemaction and the CLI 2014-06-17 22:21:58 +02:00