Lipu Fei 6db52dde46 Fix merge conflicts from ui_rework_40 ...

CURA-5943

2018-11-29 15:27:06 +01:00

..

ConfigurationItem.qml

Remove all the entries in the theme that make reference to the sidebar,

2018-10-26 17:51:28 +02:00

ConfigurationListView.qml

Add a new printer selector button that is connected to the output

2018-11-22 13:54:10 +01:00

PrintCoreConfiguration.qml

Fix null warning in QML

2018-11-22 14:03:03 +01:00

QuickConfigurationSelector.qml

Update extruderIcon to be more in line with the design

2018-11-21 13:46:50 +01:00

SyncButton.qml

Remove all the entries in the theme that make reference to the sidebar,

2018-10-26 17:51:28 +02:00