Chris Galvan f47e71da36 Merged conflicts from pulling down latest development ...

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

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

..

Assets

Added template for creation of default material library (#1040)

2021-05-28 22:11:15 +01:00

Code

Fixed more copyright header issues caused by script replacement

2021-07-02 16:21:26 -05:00

AssetProcessorGemConfig.setreg

Integrating latest from github/staging

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

CMakeLists.txt

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

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

gem.json

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

2021-07-02 15:23:10 -05:00

preview.png

Initial commit

2021-03-08 14:30:57 -08:00