Chris Galvan d7574777a8 Resolved merge conflicts ...

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

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

..

Code

Resolved merge conflicts

2021-07-02 12:42:44 -05: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

Adding missing o3de copyright headers

2021-06-29 16:31:06 -07:00

PythonTests

Resolved merge conflicts

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

Resources

[iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens. (#1625)

2021-06-28 17:53:43 -07: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

Integrating latest 47acbe8

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

preview.png

Integrating latest 47acbe8

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