Terry Michaels 9ea9cbf589 Merge pull request #1989 from aws-lumberyard-dev/cgalvan/gitflow_210708 ...

Merged stabilization/2106 to development

2021-07-08 18:03:30 -05:00

..

Editor

Merged stabilization/2106 -> development (resolved merge conflicts).

2021-07-08 13:56:47 -05:00

Framework

Merge pull request #1989 from aws-lumberyard-dev/cgalvan/gitflow_210708

2021-07-08 18:03:30 -05:00

LauncherUnified

Merged stabilization/2106 -> development (resolved merge conflicts).

2021-07-08 13:56:47 -05:00

Legacy

Fix "GameLauncher Log is Saved with Wrong File Extension" (LYN-3972). (#1984)

2021-07-08 13:14:40 -06:00

Tools

Add handling for integrity failures when applying and resolving change lists (#1993)

2021-07-08 15:59:05 -05:00

CMakeLists.txt

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

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