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 2fc1062802 Removed deprecated graphics settings/performance menu options. Updated automated test accordingly. ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>		5 years ago
..
Code	removing .orig file from previous merge	5 years ago
Editor/Scripts	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
PythonCoverage	Merged conflicts from pulling down latest development	5 years ago
PythonTests	Removed deprecated graphics settings/performance menu options. Updated automated test accordingly.	5 years ago
Resources	[LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.	5 years ago
AssetProcessorGemConfig.setreg	Integrating latest from github/staging	5 years ago
CMakeLists.txt	Resolved merge conflicts	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