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
..
MatterControl	Merge branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -07:00
Properties
app.config	Update to framework 4.6.1	2017-03-15 14:45:14 -07:00
MatterControl.Tests.csproj	Design tools	2017-03-15 16:29:56 -07:00
packages.config	Revert to NUnit 3.5	2017-02-07 11:47:57 -08:00
SceneTests.cs	Design tools	2017-03-15 16:29:56 -07:00