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
..
Assets	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Components	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Debugger	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Framework	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
GraphCanvas	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Include/ScriptCanvas	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Model	Resolved merge conflicts	5 years ago
Nodes	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Static	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Tests	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Translation	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Undo	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Utilities	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
View	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
QtMetaTypes.h	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
ReflectComponent.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
ReflectComponent.h	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
ScriptCanvasEditorGem.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Settings.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Settings.h	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
SystemComponent.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
SystemComponent.h	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
precompiled.h	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago