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

..

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

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

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

AzFramework

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

2021-07-08 18:03:30 -05: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

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

2021-07-08 13:56:47 -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

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

2021-07-08 13:56:47 -05: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