Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2021-07-12 10:45:23 -05:00

..

AzFramework

some tidying up

2021-07-09 19:39:07 +01:00

Platform

Enable AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER for Mac/Linux (#2017)

2021-07-09 09:01:35 -07:00

CMakeLists.txt

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00