mafiesto4
|
7b20bc38a4
|
Merge branch '1.5' into dotnet7
# Conflicts:
# Content/Shaders/GI/DDGI.flax
# Content/Shaders/GI/GlobalSurfaceAtlas.flax
# Content/Shaders/TAA.flax
# Content/Shaders/VolumetricFog.flax
# Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
|
2023-01-17 11:52:52 +01:00 |
|