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 f47e71da36 Merged conflicts from pulling down latest development ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>		5 years ago
..
AWSNativeSDKInit	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Android/ProjectBuilder	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
AssetBundler	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
AssetProcessor	Fixed compilation error in release configuration (#1757)	5 years ago
AzTestRunner	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
CrashHandler	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
DeltaCataloger	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
GridHub	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
News	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
ProjectManager	Merged conflicts from pulling down latest development	5 years ago
PythonBindingsExample	Resolved merge conflicts	5 years ago
RemoteConsole	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
SceneAPI	FBX to Scene part 3, tangent generation rule FBX -> SourceScene (#1747)	5 years ago
SerializeContextTools	Resolved merge conflicts	5 years ago
Standalone	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
TestImpactFramework	Fixed more copyright header issues caused by script replacement	5 years ago
CMakeLists.txt	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago