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
..
3rdParty/Python	Several small fixes to the DCCsi to match some o3de changes	5 years ago
Assets/TestData	Integrating up through commit 90f050496	5 years ago
Code	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Editor/Scripts	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Launchers/Windows	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
SDK	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Solutions	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
azpy	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
.env	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
.gitignore	Integrating up through commit 90f050496	5 years ago
.p4ignore	Add newlines to the end of all files	5 years ago
CMakeLists.txt	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
config.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
dccsi_stub	Initial commit	5 years ago
gem.json	Updated gem.json for all top-level Gems. (#1715)	5 years ago
preview.png	Initial commit	5 years ago
requirements.txt	adding qdarkstyle to requirements.txt since we removed the package from codebase	5 years ago
settings.json	Add newlines to the end of all files	5 years ago
setup.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
workspace.mel	Integrating up through commit 90f050496	5 years ago