Ghostkeeper 289399825b Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict. resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side. resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict. resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups. resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict. resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.		2018-11-27 15:01:48 +01:00
..
AutoConfiguration.qml	Add list of available configurations to AutoConfiguration	2018-11-26 17:09:36 +01:00
ConfigurationItem.qml	Increase margins around configuration item	2018-11-27 14:47:18 +01:00
ConfigurationListView.qml	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-11-27 15:01:48 +01:00
ConfigurationMenu.qml	Make manufacturer and extruder labels lighter	2018-11-27 14:03:05 +01:00
CustomConfiguration.qml	Fix width of content in tabbed content	2018-11-26 16:03:40 +01:00
PrintCoreConfiguration.qml	Make elements retain their position if hotend or material is missing	2018-11-27 14:41:48 +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