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

..

build

Ubuntu package updates (#1985)

2021-07-09 15:01:53 -07:00

bundler

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

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

commit_validation

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

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

ctest

Resolved merge conflicts

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

detect_file_changes

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

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

migration

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

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

o3de

Merged stabilization/2106 to development; Resolved merge conflicts

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

scrubbing

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

2021-06-30 19:51: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

o3de.bat

Fixed several o3de python package and install layout issues (#1714)

2021-07-02 00:22:12 -05:00

o3de.py

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

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

o3de.sh

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

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