mattercontrol/StaticData/SliceSettings
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
..
Layouts.txt Merge branch 'smash_1.7.1' into design_tools 2017-05-19 14:57:04 -07:00
Properties.json Merge branch 'smash_1.7.1' into design_tools 2017-05-19 14:57:04 -07:00