Chris Galvan d7574777a8 Resolved merge conflicts ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

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

..

AI/NavigationComponentTest

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

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

auto_test

Removed unused files to reduce size (#779)

2021-05-17 11:36:59 -05:00

AWS

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

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

Blast

Removed unused files to reduce size (#779)

2021-05-17 11:36:59 -05:00

NvCloth

Fixed cloth automated tests. (#1400)

2021-06-17 19:23:12 +01:00

ocean_component

Removed unused files to reduce size (#779)

2021-05-17 11:36:59 -05:00

ocean_trackview

Removed unused files to reduce size (#779)

2021-05-17 11:36:59 -05:00

Physics

Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

2021-06-18 13:25:53 -07:00

Prefab/PrefabLevel_OpensLevelWithEntities

Fix the relative path in the Source param for the PrefabLevel_OpensLevelWithEntities prefab (#1196)

2021-06-08 17:44:30 -07:00

Simple

Resaved Simple Level to remove deleted components (#1066)

2021-06-01 14:25:38 -05:00

TestDependenciesLevel

Removed unused files to reduce size (#779)

2021-05-17 11:36:59 -05:00

Utils

Removed unused files to reduce size (#779)

2021-05-17 11:36:59 -05:00

WhiteBox/EmptyLevel

Removed unused files to reduce size (#779)

2021-05-17 11:36:59 -05:00