Merge branch 'stabilization/2106' into cpack/2106-upload-fix

This commit is contained in:
scottr
2021-06-23 15:16:33 -07:00
18079 changed files with 84585 additions and 175689 deletions
@@ -1,12 +1,8 @@
#
# 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
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
# 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.
#
# convert the path to a windows style path using string replace because TO_NATIVE_PATH