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.

Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>		5 years ago
..
Asset	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Buffer	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Image	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Material	Resolved merge conflicts	5 years ago
Model	Fix for ATOM-15923 : Editor Spends Several Minutes Entering/Ending Play Game Mode (#1846)	5 years ago
Pass	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Shader	Resolved merge conflicts	5 years ago
System	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Base.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
FeatureProcessorDescriptor.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
GpuQuerySystemDescriptor.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
RPISystemDescriptor.cpp	Resolved merge conflicts	5 years ago
ResourcePoolAsset.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
ResourcePoolAssetCreator.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago