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

# Conflicts:
#	Code/Framework/AzCore/AzCore/Settings/SettingsRegistryImpl.cpp

2021-08-13 15:04:47 -07:00

..

AzCore

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

2021-08-13 15:04:47 -07:00

Platform

Merge branch 'development' into cmake/SPEC-7484

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

Tests

Settings registry notification deadlock fix (#3065)

2021-08-13 16:20:08 -05:00

CMakeLists.txt

Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)

2021-07-26 14:14:56 -07:00