Merge branch 'Plasma/5.14'
a0aa9373092a
Actions

Authored by ngraham on Sep 21 2018, 3:14 PM.

Description

Merge branch 'Plasma/5.14'

Committed

ngraham

Sep 21 2018, 3:14 PM

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	fde8d23beeae		D14011	bosimonsen/ngraham	Use QtQuick.Controls 2.0 Label in energy and fileindexmonitor KCM	Sep 21 2018

				Path	Packages
	M			Modules/energy/package/contents/ui/main.qml
	M			Modules/fileindexermonitor/package/contents/ui/main.qml