Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de ...

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py

2021-07-16 13:21:55 -07:00

..

AzCore

Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de

2021-07-16 13:21:55 -07:00

Platform

Remove last of Great ScriptCanvas purge code, fix purity categorization handler connection control

2021-07-08 08:53:19 -07:00

Tests

Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de

2021-07-16 13:21:55 -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