merge latest

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-06-30 20:42:41 -07:00
18863 changed files with 19890 additions and 19541 deletions
@@ -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
*