Danilo Aimini ed199b736a Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking

2021-08-11 16:35:56 -07:00

..

Editor

fixes after merge

2021-08-11 13:56:03 -07:00

Framework

Merge branch 'development' of https://github.com/o3de/o3de into daimini/settings-registry-origin-tracking

2021-08-11 16:35:56 -07:00

LauncherUnified

Merge branch 'development' into cmake/SPEC-7182

2021-08-11 11:16:24 -07:00

Legacy

fixes after merge

2021-08-11 13:56:03 -07:00

Tools

Merge branch 'development' into cmake/SPEC-7484

2021-08-11 07:55:26 -07:00

CMakeLists.txt

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00