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
..
3rdParty	Resolved merge conflicts	5 years ago
Platform	Resolved merge conflicts	5 years ago
TestImpactFramework	Resolved merge conflicts	5 years ago
Tools	Resolved merge conflicts	5 years ago
install	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
3rdParty.cmake	Fixed several o3de python package and install layout issues (#1714)	5 years ago
3rdPartyPackages.cmake	Change 3p default CDN endpoint (#1749)	5 years ago
CMakeFiles.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
CommandExecution.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Configurations.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Dependencies.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Deployment.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
EngineJson.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
FileUtil.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Findo3de.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Gems.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
GeneralSettings.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Install.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
LYPackage_S3Downloader.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
LYPython.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
LYTestWrappers.cmake	Resolved merge conflicts	5 years ago
LYWrappers.cmake	Fixed several o3de python package and install layout issues (#1714)	5 years ago
LyAutoGen.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
LySet.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Monolithic.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
O3DEJson.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
OutputDirectory.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
PAL.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
PALTools.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Packaging.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
PackagingConfig.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Projects.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
RuntimeDependencies.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
SettingsRegistry.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
UnitTest.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Version.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
__init__.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
cmake_files.cmake	Resolved merge conflicts	5 years ago
createplatformfiles.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
gemcmake.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
mocfix.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
projectcmake.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
reroot.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
waffiles2cmake.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
warn_fix.py	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago