Ghostkeeper 7df4c01814 Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: cura/Settings/MachineManager.py -> rowCount vs. count resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten. resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed. resources/qml/Toolbar.qml -> Git was wrong, not a conflict. resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.		2018-12-03 11:45:05 +01:00
..
Materials	Use ListModel.count instead of rowCount	2018-12-03 11:13:26 +01:00
GeneralPage.qml	Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0	2018-11-30 15:34:47 +01:00
MachinesPage.qml	Use ListModel.count instead of rowCount	2018-12-03 11:13:26 +01:00
ProfilesPage.qml	Use ListModel.count instead of rowCount	2018-12-03 11:13:26 +01:00
ProfileTab.qml	Store extruder position of quality groups as int	2018-03-12 17:08:13 +01:00
ReadOnlySpinBox.qml	Fix Enter key handling on material management page	2018-03-16 11:05:38 +01:00
ReadOnlyTextArea.qml	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
ReadOnlyTextField.qml	Fix Enter key handling on material management page	2018-03-16 11:05:38 +01:00
SettingVisibilityPage.qml	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-12-03 11:45:05 +01:00