Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -1,6 +1,6 @@
 {
    "engine_name": "o3de",
    "FileVersion": 1,
-    "LumberyardVersion": "0.0.0.0",
-    "LumberyardCopyrightYear": 2021
+    "O3DEVersion": "0.0.0.0",
+    "O3DECopyrightYear": 2021
 }