Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge confligts?

Browse Source
This commit is contained in:
Pilzinsel64
2024-11-20 12:41:39 +01:00
parent 55d221cb81
commit 3070fab91b
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj
View File

@@ -31,8 +31,6 @@
<ItemGroup>
<PackageReference Include="OpenTK.Input" Version="4.8.2" />
<PackageReference Include="OpenTK.WinForms" Version="4.0.0-pre.6" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="OpenTK" Version="4.8.2" />

14
Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/ContentPipe.vb
View File

@@ -1,19 +1,9 @@
' Nicht gemergte Änderung aus Projekt "Pilz.Drawing.Drawing3D.OpenGLFactory (net6.0-windows)"
' Vor:
' Imports OpenTK
' Imports OpenTK.Graphics.OpenGL
' Imports System.Drawing
' Nach:
' Imports System.Drawing
' Imports System.Drawing.Imaging
'
' Imports OpenTK
.Drawing
Imports System.Drawing.Imaging
Imports System.Drawing.Imaging
Imports OpenTK.Graphics.OpenGL
Imports Bitmap = System.Drawing.Bitmap
Imports System.Drawing
Namespace RenderingN