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

..

Include/AtomLyIntegration/CommonFeatures

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

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

Resources

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

Source

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

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

atomlyintegration_commonfeatures_editor_files.cmake

Resolved merge conflicts

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

atomlyintegration_commonfeatures_files.cmake

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

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

atomlyintegration_commonfeatures_public_files.cmake

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

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

atomlyintegration_commonfeatures_shared_files.cmake

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

2021-06-30 19:51:55 -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