mirror of
https://github.com/stride3d/stride.git
synced 2026-10-12 02:23:23 +00:00
# Conflicts: # build/Stride.Android.sln # build/Stride.Build.props # build/Stride.Runtime.sln # build/Stride.UnitTests.Build.targets # build/Stride.build # build/Stride.iOS.sln # build/Stride.sln # sources/Directory.Packages.props # sources/engine/Stride.Engine.Tests/TesselationTest.cs # sources/engine/Stride.Graphics/OpenGL/CommandList.OpenGL.cs # sources/engine/Stride.Graphics/OpenGL/GraphicsDevice.OpenGL.cs # sources/engine/Stride.Graphics/Vulkan/GraphicsAdapterFactory.Vulkan.cs # sources/engine/Stride.Graphics/Vulkan/GraphicsDevice.Vulkan.cs # sources/engine/Stride.Shaders.Compiler/Stride.Shaders.Compiler.csproj # sources/engine/Stride.Shaders.Parser/Stride.Shaders.Parser.csproj # sources/engine/Stride.Shaders.Tests/Stride.Shaders.Tests.Windows.csproj # sources/sdk/Stride.Build.Sdk/Sdk/Stride.Graphics.targets # sources/shaders/Irony.GrammarExplorer/Irony.GrammarExplorer.csproj # sources/shaders/Irony/Irony.csproj # sources/shaders/Stride.Core.Shaders/Stride.Core.Shaders.csproj # sources/shaders/Stride.Shaders/Stride.Shaders.csproj # sources/targets/Stride.UnitTests.targets # sources/targets/Stride.targets