birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gene Walters
2021-06-28 19:09:20 -07:00
parent 7b618d9db2 c7d000e14b
commit 4e14c0069b
18674 changed files with 87627 additions and 179297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Levels/AI/NavigationComponentTest/NavigationAgent.lua
+3 -7
View File
@@ -1,13 +1,9 @@
----------------------------------------------------------------------------------------------------
--
-- 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.
--
--
----------------------------------------------------------------------------------------------------
AutomatedTesting/Levels/AWS/Metrics/Script/Metrics.lua
+3 -7
View File
@@ -1,13 +1,9 @@
----------------------------------------------------------------------------------------------------
--
-- 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.
--
--
----------------------------------------------------------------------------------------------------