You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
build	Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de	5 years ago
bundler	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
commit_validation	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
ctest	Resolved merge conflicts	5 years ago
detect_file_changes	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
migration	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
o3de	Merged stabilization/2106 to development; Resolved merge conflicts	5 years ago
scrubbing	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
CMakeLists.txt	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
o3de.bat	Fixed several o3de python package and install layout issues (#1714)	5 years ago
o3de.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
o3de.sh	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago