Commit graph

3 commits

Author SHA1 Message Date
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
Aleix Pol
e1813b16f3 Port plasmoid 2014-06-27 15:29:53 +02:00
Aleix Pol
3e74a97304 Port plasmoid to Plasma Next 2014-06-18 02:35:48 +02:00
Renamed from plasmoid/package/contents/ui/kdeconnect.qml (Browse further)