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.

Gene Walters d2da35aec3 merging latest dev + resolving 1 conflict ... Signed-off-by: Gene Walters <genewalt@amazon.com>		4 years ago
..
Code	merging latest dev + resolving 1 conflict	4 years ago
Editor/Scripts	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
PythonCoverage	Setting /permissive- to make MSVC more "standard" (#3701)	5 years ago
PythonTests	First in set of PRs for adding parallel GPU test runs to Atom tests. (#4276)	4 years ago
Resources	Remove non-existant files from icon contents.json files (#3148)	5 years ago
AssetProcessorGemConfig.setreg	Integrating latest from github/staging	5 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
gem.json	Updated gem.json for all top-level Gems. (#1715) (#1917)	5 years ago
preview.png	Integrating latest 47acbe8	5 years ago