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.

Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de ... Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> # Conflicts: # scripts/build/bootstrap/incremental_build_util.py		5 years ago
..
Clang	Resolved merge conflicts	5 years ago
MSVC	Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de	5 years ago
Configurations_common.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
Directory.Build.props	Add Vcpkg settings to map configs to what vcpkg expects (this prevents a message from being issue when vcpkg is installed) (#2063)	5 years ago
Install_common.cmake	Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de	5 years ago
LYWrappers_default.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
RuntimeDependencies_common.cmake	SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" (#1742)	5 years ago
TargetIncludeSystemDirectories_supported.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
TargetIncludeSystemDirectories_unsupported.cmake	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
VisualStudio_common.cmake	Add support for VS2022 (#2065)	5 years ago
runtime_dependencies_common.cmake.in	Issues/2045 3rdParty runtime dependencies copied multiple times (#2058)	5 years ago