nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work

Browse source
This commit is contained in:
Gregory Diaz 2015-04-20 17:29:03 -07:00
commit 92c447f5b4
64 changed files with 2437 additions and 671 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MatterControl.csproj
View file

@ -164,6 +164,7 @@
<Compile Include="CustomWidgets\SlideWidget.cs" />
<Compile Include="CustomWidgets\SolidProgressControl.cs" />
<Compile Include="CustomWidgets\SolidSlider.cs" />
<Compile Include="CustomWidgets\ThumbnailTracer.cs" />
<Compile Include="DataStorage\Models.cs" />
<Compile Include="LocalizedString.cs" />
<Compile Include="PartPreviewWindow\BedSettings.cs" />
@ -218,7 +219,6 @@
<Compile Include="SlicerConfiguration\MatterSliceInfo.cs" />
<Compile Include="SlicerConfiguration\Slic3rInfo.cs" />
<Compile Include="SlicerConfiguration\SliceEngineInfo.cs" />
<Compile Include="SlicerConfiguration\SliceSettingsWidgetUiState.cs" />
<Compile Include="SlicerConfiguration\SettingsControlSelectors.cs" />
<Compile Include="SlicerConfiguration\SlicePresetsWindow\SlicePresetDetailWidget.cs" />
<Compile Include="SlicerConfiguration\SlicePresetsWindow\SlicePresetListWidget.cs" />
@ -404,6 +404,10 @@
<Project>{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}</Project>
<Name>Csg</Name>
</ProjectReference>
<ProjectReference Include="SubModules\agg-sharp\DataConverters3D\DataConverters3D.csproj">
<Project>{04667764-dc7b-4b95-aef6-b4e6c87a54e9}</Project>
<Name>DataConverters3D</Name>
</ProjectReference>
<ProjectReference Include="Submodules\agg-sharp\Gui\Gui.csproj">
<Project>{74F6BB6C-9D02-4512-A59A-21940E35C532}</Project>
<Name>Gui</Name>