John Jones-Steele 5bdbf0baa3 Merge branch 'development' into LYN-4501 ...

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

2021-07-12 14:24:05 +01:00

..

Editor

Text changed and default behaviour changed

2021-07-12 12:19:01 +01:00

Framework

Merge pull request #2036 from aws-lumberyard-dev/lua-scene-queries

2021-07-12 11:57:51 +01: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