Guthrie Adams 9f65277906 restoring changes lost in merge ...

Signed-off-by: Guthrie Adams <guthadam@amazon.com>

2021-09-15 19:17:33 -05:00

..

Include/AtomLyIntegration/CommonFeatures

Merge branch 'development' into Atom/guthadam/multiple_dockable_pinned_material_component_property_editor

2021-09-15 18:45:22 -05:00

Resources

Add newlines to the end of all files

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

Source

restoring changes lost in merge

2021-09-15 19:17:33 -05:00

atomlyintegration_commonfeatures_editor_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

atomlyintegration_commonfeatures_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

atomlyintegration_commonfeatures_public_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

atomlyintegration_commonfeatures_shared_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

CMakeLists.txt

Set enable gem variants feature (#3631)

2021-09-01 11:01:50 -05:00