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

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

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

..

VisualStudioCodeInstance.cs

Mac progress

2021-12-27 17:06:26 +01:00

VisualStudioCodeProjectGenerator.cs

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

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