hultonha 2ea9bfb144 merge stabilization/2106 into development ...

Signed-off-by: hultonha <hultonha@amazon.co.uk>

2021-07-06 17:34:04 +01:00

..

AtomCore

Resolved merge conflicts

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

AzAndroid/java/com/amazon

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

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

AzAutoGen

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

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

AzCore

merge stabilization/2106 into development

2021-07-06 17:34:04 +01:00

AzFramework

merge stabilization/2106 into development

2021-07-06 17:34:04 +01:00

AzGameFramework

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

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

AzManipulatorTestFramework

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

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

AzNetworking

Resolved merge conflicts

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

AzQtComponents

Resolved merge conflicts

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

AzTest

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

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

AzToolsFramework

merge stabilization/2106 into development

2021-07-06 17:34:04 +01:00

Crcfix

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

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

GFxFramework

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

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

GridMate

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

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

Tests

Move camera properties from CVars to the Settings Registry (#1766)

2021-07-05 13:08:05 +01:00

CMakeLists.txt

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

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