AMZN-ScottR eb713fb3a8 Merge branch 'development' into profiler_capture_api ...

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

2021-10-28 12:19:50 -07:00

..

AzCore

Merge branch 'development' into profiler_capture_api

2021-10-28 12:19:50 -07:00

Platform

[profiler_capture_api] fixed ambiguous LogLevel type in some unity file scenarios

2021-10-25 11:51:34 -07:00

Tests

Support for importing Json files (#4609)

2021-10-21 09:13:43 -07:00

CMakeLists.txt

Update ZLIB min req osx ios and android to reasonable limits (#4473)

2021-10-05 15:20:26 -07:00