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

Resolved merge conflicts

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-07-02 12:42:44 -05:00
parent 9f61ed426c 1cf6e6dd10
commit d7574777a8
18948 changed files with 23832 additions and 24928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
+1 -1
View File
@@ -1,4 +1,4 @@
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
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/__init__.py
+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
"""
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/__init__.py
+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
"""
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py
+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
"""
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py
+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
#
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py
+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
"""
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
+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
"""
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py
+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
"""
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py
+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
"""
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
+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
"""
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py
+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
"""