Merge branch 'stabilization/2106' into Atom/dmcdiar/LYN-4660

This commit is contained in:
Doug McDiarmid
2021-06-23 13:44:01 -07:00
18062 changed files with 82833 additions and 175038 deletions
@@ -1,14 +1,9 @@
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*
* For complete copyright and license terms please see the LICENSE at the root of this
* distribution (the "License"). All use of this software is governed by the License,
* or, if provided, by the license below or the license accompanying this file. Do not
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
*/
* Copyright (c) Contributors to the Open 3D Engine Project
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <RenderCommon.h>