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

..

Editor

[development] complete removal of CryThread*.h and MultiThread.h from CryCommon (#3067)

2021-08-13 05:43:21 -07:00

Framework

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

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

LauncherUnified

[redcode/crythread-2nd-pass] post merge duplicates removed

2021-08-12 16:51:54 -07:00

Legacy

[redcode/crythread-2nd-pass] post merge duplicates removed

2021-08-12 16:51:54 -07:00

Tools

Fixed white-bar at bottom of Project Manager screen (#3091)

2021-08-13 09:09:55 -07:00

CMakeLists.txt

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

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