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
..
AtomCore	Resolved merge conflicts	5 years ago
AzAndroid/java/com/amazon	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
AzAutoGen	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
AzCore	Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de	5 years ago
AzFramework	Combine Framework.Tests and AzToolsFramework.Tests targets into one target	5 years ago
AzGameFramework	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
AzManipulatorTestFramework	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
AzNetworking	Fix positional desync of network objects plus related log spam	5 years ago
AzQtComponents	One hamburger menu to rule them all (#2232)	5 years ago
AzTest	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
AzToolsFramework	Restore fix lost in merge: [LY-121929] Asset Processor Error : Sqlite - Failed to prepare statement. (#2202)	5 years ago
Crcfix	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
GFxFramework	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
GridMate	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
CMakeLists.txt	fixes and cmake changes to get it to compile	5 years ago