Lars Brubaker 352eb792f1 Merge branch 'smash_1.7.1' into design_tools ... # Conflicts: # PartPreviewWindow/View3D/View3DWidget.cs # SlicerConfiguration/SliceSettingsWidget.cs # SlicerConfiguration/SlicingQueue.cs # StaticData/SliceSettings/Properties.json		2017-05-19 14:57:04 -07:00
..
BaseClasses	Design tools	2017-03-15 16:29:56 -07:00
View3D	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
BedSettings.cs
ColorGradientWidget.cs	Moved TextWidget.GlobalPointSizeScaleRatio -> GuiWidget.DeviceScale	2016-05-06 17:56:27 -07:00
CreateDiscreteMeshes.cs	Use new ImageBuffer constructor with common defaults	2016-09-23 10:35:33 -07:00
PartPreviewContent.cs	Design tools	2017-03-15 16:29:56 -07:00
PartPreviewMainWindow.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
PlatingHelper.cs	Design tools	2017-03-15 16:29:56 -07:00
SaveAsWindow.cs	Design tools	2017-03-15 16:29:56 -07:00
SelectedObjectPanel.cs	Design tools	2017-03-15 16:29:56 -07:00
ViewControls2D.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
ViewControls3D.cs	Design tools	2017-03-15 16:29:56 -07:00
ViewGcodeBasic.cs	Fixed a bug with changing to a null print item in gcode view	2017-03-21 10:03:03 -07:00
ViewGcodeWidget.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00