Needs merging with trunk
Text conflict in qml/Dash/DashApps.qml
Contents conflict in qml/Dash/DashPreview.qml
Text conflict in qml/Dash/GenericScopeView.qml
Text conflict in qml/Shell.qml
Text conflict in tests/autopilot/unity8/shell/emulators/dash.py
Needs merging with trunk DashApps. qml DashPreview. qml GenericScopeVie w.qml /unity8/ shell/emulators /dash.py
Text conflict in qml/Dash/
Contents conflict in qml/Dash/
Text conflict in qml/Dash/
Text conflict in qml/Shell.qml
Text conflict in tests/autopilot