Wojciech Figat e115aa2c4e Merge remote-tracking branch 'origin/master' into 1.5 ...

# Conflicts:
#	Source/Engine/Content/JsonAsset.cpp

2022-10-19 13:36:46 +02:00

..

Flax.Build

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

2022-10-19 13:36:46 +02:00

Flax.Build.Tests

Update to .Net Framework 4.5.2

2022-07-13 21:19:47 +02:00

Flax.Stats

Update to .Net Framework 4.5.2

2022-07-13 21:19:47 +02:00

FlaxEngine.Tests

Fix generated project reference in test project

2022-10-11 11:38:22 +02:00