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
..
3rdParty/ACES	O3DE Copyright Updates for Linux Foundation (#1504)	5 years ago
Include/Atom/Feature	Resolved merge conflicts	5 years ago
Mocks	Resolved merge conflicts	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_feature_common_builders_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
atom_feature_common_editor_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
atom_feature_common_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
atom_feature_common_public_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
atom_feature_common_shared_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
atom_feature_common_staticlibrary_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
atom_feature_common_tests_files.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago