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.

Mike Balfour 92b0514b48 Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE ... # Conflicts: # Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp Also fixed bad merge on ScripCanvas MainWindow.cpp Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>		4 years ago
..
Assets	Script Canvas node translation system and naming consistency	4 years ago
Code	Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE	4 years ago
Registry	Script Canvas node translation system and naming consistency	4 years ago
.gitignore	Added .gitignore so that Script Canvas debug logs don't get picked up as untracked files.	5 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
gem.json	License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272)	4 years ago
preview.png	Initial commit	5 years ago