Esteban Papp dd3f0b86e0 Merge branch 'development' into cmake/SPEC-7484 ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ToolBox.cpp

2021-08-02 18:45:25 -07:00

..

3rdParty/ACES

O3DE Copyright Updates for Linux Foundation (#1504)

2021-06-23 10:55:22 -07:00

Include/Atom/Feature

Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion

2021-08-02 09:07:42 -07:00

Mocks

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

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

Source

Merge branch 'development' into cmake/SPEC-7484

2021-08-02 18:45:25 -07:00

Tests

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

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

atom_feature_common_builders_files.cmake

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

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

atom_feature_common_editor_files.cmake

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

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

atom_feature_common_files.cmake

Reintroduce .h and .inl split

2021-07-31 00:26:28 -06:00

atom_feature_common_public_files.cmake

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

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

atom_feature_common_shared_files.cmake

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

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

atom_feature_common_staticlibrary_files.cmake

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

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

atom_feature_common_tests_files.cmake

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

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

CMakeLists.txt

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

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