Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628

This commit is contained in:
Gene Walters
2021-06-28 19:09:20 -07:00
18674 changed files with 87627 additions and 179297 deletions
@@ -1,12 +1,7 @@
"""
All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
its licensors.
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 (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.
SPDX-License-Identifier: Apache-2.0 OR MIT
Example test using LyTestTools to test Lumberyard.
"""