Wojtek Figat addc6d5216 Merge remote-tracking branch 'origin/master' into 1.10 ...

# Conflicts:
#	Content/Editor/Gizmo/Material.flax
#	Content/Engine/DefaultTerrainMaterial.flax
#	Source/Editor/Windows/Assets/ModelWindow.cs
#	Source/Editor/Windows/Assets/SkinnedModelWindow.cs
#	Source/Engine/Core/Types/Variant.cpp

2025-01-13 18:07:54 +01:00

..

Flax.Build

Merge remote-tracking branch 'origin/master' into 1.10

2025-01-13 18:07:54 +01:00

Flax.Build.Tests

Include configuration specific source files in solution configurations

2024-06-01 23:23:32 +03:00