You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		4 years ago
..
Assets	replacing 1.0 mat ed model changes, filename change	5 years ago
Code	Merge branch 'development' into cmake/SPEC-2513_w4244	4 years ago
Scripts	Moved material editor document system buses and system components to atom tools framework	4 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MaterialEditor.xml	Initial commit	5 years ago
gem.json	Updated gem.json for all top-level Gems. (#1715)	5 years ago
preview.svg	ATOM-15128 replacing material editor icon	5 years ago
workspace.mel	Integrating up through commit 90f050496	5 years ago