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.

mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622 ... # Conflicts: # Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp # Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h # Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp		5 years ago
..
Assets	Added template for creation of default material library (#1040)	5 years ago
Code	Merge branch 'stabilization/2106' into mbalfour/gitflow_210622	5 years ago
AssetProcessorGemConfig.setreg	Integrating latest from github/staging	5 years ago
CMakeLists.txt	LYN-3069 Revert some 3rdparty changes and address issue (#185)	5 years ago
gem.json	Integrating latest 47acbe8	5 years ago
preview.png	Initial commit	5 years ago