pappeste 5838436e31 Merge branch 'main' into ly-as-sdk/LYN-2948 ...

# Conflicts:
#	CMakeLists.txt

2021-05-10 14:36:20 -07:00

..

CryCommon

Merge pull request #544 from aws-lumberyard-dev/MultiplayerComponents

2021-05-10 10:23:15 -07:00

CrySystem

Merge branch 'main' into ly-as-sdk/LYN-2948

2021-05-10 14:36:20 -07:00

CMakeLists.txt

Remove CryFont and initialization functions related to the legacy renderer. (#485)

2021-04-30 15:02:11 -06:00