mafiesto4 93c0dd704e Merge branch 'master' into 1.5 ...

# Conflicts:
#	Source/Engine/Serialization/Stream.cpp

2022-11-21 15:51:57 +01:00

..

AssetHeader.h

…

ContentStorageManager.cpp

…

ContentStorageManager.h

…

FlaxChunk.h

…

FlaxFile.h

…

FlaxPackage.h

…

FlaxStorage.cpp

Merge branch 'master' into 1.5

2022-11-21 15:51:57 +01:00

FlaxStorage.h

…

FlaxStorageReference.h

…

JsonStorageProxy.cpp

…

JsonStorageProxy.h

…