Ghostkeeper 266e08fdff Merge branch 'master' into ui_rework_4_0 ... Conflicts: plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky. resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.		2018-11-13 16:23:36 +01:00
..
Materials	Simplified QML expression	2018-10-08 17:22:04 +02:00
GeneralPage.qml	Merge branch 'master' into ui_rework_4_0	2018-11-13 16:23:36 +01:00
MachinesPage.qml	CURA-5158 Create a custom signal that is emitted when global container	2018-03-28 11:07:48 +02:00
ProfilesPage.qml	Select the current profile when showing the profiles page	2018-06-26 12:02:41 +02: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	Minor code style fixes	2018-10-10 14:18:37 +02:00