Merge branch 'Plasma/5.10'
966e91a8dfb6
Actions

Authored by davidedmundson on Jun 5 2017, 12:38 PM.

Description

Merge branch 'Plasma/5.10'

Committed

davidedmundson

Jun 5 2017, 12:38 PM

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	7bd909fa3a4f		D6100	davidedmundson	Only enable MPRIS global shortcuts on demand	Jun 5 2017
	8cc06c36c769			apol	Small fix on test helper	Jun 1 2017

				Path	Packages
	M			applets/mediacontroller/contents/ui/main.qml
	M			dataengines/mpris2/multiplexedservice.cpp
	M			dataengines/mpris2/multiplexedservice.h
	M			dataengines/mpris2/multiplexer.cpp
	M			shell/coronatesthelper.cpp
	M			shell/coronatesthelper.h