kdeconnect-kde/plasmoid/package/contents/ui
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
..
Battery.qml Merge branch 'master' into frameworks 2014-07-01 23:59:38 +02:00
CompactRepresentation.qml Port plasmoid to Plasma Next 2014-06-18 02:35:48 +02:00
DeviceDelegate.qml Port plasmoid to Plasma Next 2014-06-18 02:35:48 +02:00
FullRepresentation.qml Merge branch 'master' into frameworks 2014-07-01 23:59:38 +02:00
main.qml Port plasmoid to Plasma Next 2014-06-18 02:35:48 +02:00
Sftp.qml Port plasmoid to Plasma Next 2014-06-18 02:35:48 +02:00