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-30 09:43:21 -07:00
commit de93d8efd8
22 changed files with 779 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControl.csproj
View file

@ -403,7 +403,7 @@
<Project>{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}</Project>
<Name>Csg</Name>
</ProjectReference>
<ProjectReference Include="SubModules\agg-sharp\DataConverters3D\DataConverters3D.csproj">
<ProjectReference Include="Submodules\agg-sharp\DataConverters3D\DataConverters3D.csproj">
<Project>{04667764-dc7b-4b95-aef6-b4e6c87a54e9}</Project>
<Name>DataConverters3D</Name>
</ProjectReference>