merge from stabilization/2106

Signed-off-by: greerdv <greerdv@amazon.com>
This commit is contained in:
greerdv
2021-07-01 11:30:16 +01:00
18876 changed files with 21435 additions and 19428 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project
* Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*