Wojtek Figat 6b35c0a161 Merge remote-tracking branch 'origin/master' into 1.8 ...

# Conflicts:
#	Flax.flaxproj

2024-03-19 20:23:34 +01:00

..

AssetHeader.h

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

2024-03-19 20:23:34 +01:00

ContentStorageManager.cpp

Update year in copyright note

2024-02-26 19:00:48 +01:00

ContentStorageManager.h

Update year in copyright note

2024-02-26 19:00:48 +01:00

FlaxChunk.h

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

2024-02-26 19:49:39 +01:00

FlaxFile.h

Update year in copyright note

2024-02-26 19:00:48 +01:00

FlaxPackage.h

Update year in copyright note

2024-02-26 19:00:48 +01:00

FlaxStorage.cpp

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

2024-03-19 20:23:34 +01:00

FlaxStorage.h

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

2024-02-26 19:49:39 +01:00

FlaxStorageReference.h

Update year in copyright note

2024-02-26 19:00:48 +01:00

JsonStorageProxy.cpp

Update year in copyright note

2024-02-26 19:00:48 +01:00

JsonStorageProxy.h

Update year in copyright note

2024-02-26 19:00:48 +01:00