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 d7574777a8 Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>		5 years ago
..
AZSL/Platform	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Source	Resolved merge conflicts	5 years ago
Tests	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
CMakeLists.txt	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
atom_asset_shader_builders_files.cmake	Resolved merge conflicts	5 years ago
atom_asset_shader_builders_shared_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
atom_asset_shader_builders_stub_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
atom_asset_shader_builders_tests_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago