Lars Brubaker 77c3b78eb1 Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools ... # Conflicts: # PartPreviewWindow/PartPreviewContent.cs		2017-05-24 15:07:06 -07:00
..
BaseClasses	Continue migrating features to new layout	2017-05-23 19:07:57 -07:00
View3D	Move more widgets to printer action bar	2017-05-24 14:19:02 -07:00
BedSettings.cs
ColorGradientWidget.cs
CreateDiscreteMeshes.cs	Use new ImageBuffer constructor with common defaults	2016-09-23 10:35:33 -07:00
OverflowDropdown.cs	Move more widgets to printer action bar	2017-05-24 14:19:02 -07:00
PartPreviewContent.cs	Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools	2017-05-24 15:07:06 -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	Throw exceptions for missing functionality rather than Debug.Break	2017-05-21 22:37:30 -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	Move more widgets to printer action bar	2017-05-24 14:19:02 -07:00
ViewGcodeBasic.cs	Continue migrating features to new layout	2017-05-23 19:07:57 -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