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

..

Android/ProjectBuilder

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

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

AssetBundler

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

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

AssetProcessor

{SPEC-7645} Disabling FileWatcherUnitTests for Linux (#2012)

2021-07-09 13:36:33 -05:00

AWSNativeSDKInit

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

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

AzTestRunner

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

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

CrashHandler

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

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

DeltaCataloger

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

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

GridHub

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

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

ProjectManager

Aftermath for PR-1956 and PR-2025 (#2035)

2021-07-12 08:30:07 +02:00

PythonBindingsExample

Resolved merge conflicts

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

RemoteConsole

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

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

SceneAPI

Revert "[MeshOptimizer] Determine the original vertex index based on the position (#1562)" (#1902)

2021-07-07 14:28:53 +02:00

SerializeContextTools

Merge branch 'stabilization/2106' into hultonha/gitflow_210706

2021-07-06 20:23:14 +01:00

Standalone

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

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

TestImpactFramework

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

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

CMakeLists.txt

Remove NewsBuilder project from Editor solution, as it is no longer used.

2021-07-08 15:51:53 -07:00