Cura/resources/qml/ActionPanel
Ghostkeeper b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
2018-12-04 15:21:36 +01:00
..
ActionPanelWidget.qml Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
OutputDevicesActionButton.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-11-27 15:01:48 +01:00
OutputProcessWidget.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-04 15:21:36 +01:00
PrintInformationWidget.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-04 15:21:36 +01:00
PrintJobInformation.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-03 11:45:05 +01:00
SliceProcessWidget.qml Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 2018-12-04 15:21:36 +01:00