Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). ...

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

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

..

Code

removing .orig file from previous merge

2021-07-06 17:46:24 +01:00

Editor/Scripts

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

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

PythonCoverage

Merged conflicts from pulling down latest development

2021-07-02 16:29:27 -05:00

PythonTests

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

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

Resources

[LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.

2021-07-07 11:29:18 -05:00

AssetProcessorGemConfig.setreg

Integrating latest from github/staging

2021-03-26 14:32:02 -07:00

CMakeLists.txt

Resolved merge conflicts

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

gem.json

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00

preview.png

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00