mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Samuliak
2024-05-24 15:32:02 +02:00
committed by Evan Husted
parent 91aed4d0dd
commit 084b75a398
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Directory.Packages.props
View File

@@ -44,7 +44,11 @@
<PackageVersion Include="Gommon" Version="2.6.8" />
<PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
<PackageVersion Include="shaderc.net" Version="0.1.0" />
<<<<<<< HEAD
<PackageVersion Include="SharpMetal" Version="1.0.0-preview14" />
=======
<PackageVersion Include="SharpMetal" Version="1.0.0-preview12" />
>>>>>>> 3eab14be7 (Set scissors & viewports)
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
<PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
<PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />