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

..

Include/AtomBridge

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

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

Source

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

atombridge_editor_files.cmake

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

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

atombridge_files.cmake

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

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

atombridge_shared_files.cmake

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

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

CMakeLists.txt

ly_create_alias() now adds the directory it was called from to the (#2120)

2021-07-12 20:22:32 -05:00