Merge remote-tracking branch 'refs/remotes/origin/gles3' into dev

PaintLab · Oct 13, 2018 · 40fb6a2 · 40fb6a2
2 parents bb0448b + c5fe27a
commit 40fb6a2
Show file tree

Hide file tree

Showing 625 changed files with 1,092,844 additions and 49,220 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 
 # mstest test results
 TestResults
+*src/PixelFarm/BackEnd.MiniOpenTK/src/Generator.Bind/Specifications/Docs/
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

diff --git a/src/MiniDev.sln b/src/MiniDev.sln
diff --git a/src/PixelFarm/BackEnd.MiniOpenTK.NetCore/BackEnd.MiniOpenTK.NetCore.csproj b/src/PixelFarm/BackEnd.MiniOpenTK.NetCore/BackEnd.MiniOpenTK.NetCore.csproj
diff --git a/src/PixelFarm/BackEnd.MiniOpenTK.NetCore/Extensions/Extensions.cs b/src/PixelFarm/BackEnd.MiniOpenTK.NetCore/Extensions/Extensions.cs
diff --git a/src/PixelFarm/BackEnd.MiniOpenTK/BackEnd.MiniOpenTK.csproj b/src/PixelFarm/BackEnd.MiniOpenTK/BackEnd.MiniOpenTK.csproj
diff --git a/src/PixelFarm/BackEnd.MiniOpenTK/Bind.exe b/src/PixelFarm/BackEnd.MiniOpenTK/Bind.exe