Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244 ...

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

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp

2021-08-17 12:10:46 -07:00

..

Include/AtomToolsFramework

Merge branch 'development' into cmake/SPEC-2513_w4244

2021-08-17 12:10:46 -07:00

Source

Merge pull request #3126 from aws-lumberyard-dev/Atom/guthadam/atomtools_restore_source_control_spam_filter

2021-08-17 10:11:54 -05:00

Tests

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

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

atomtoolsframework_files.cmake

Moved material editor document system buses and system components to atom tools framework

2021-08-12 22:11:18 -05:00

atomtoolsframework_shared_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