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
@@ -373,7 +373,7 @@
 #define ID_DOCUMENTATION_GETTINGSTARTEDGUIDE    36023
 #define ID_DOCUMENTATION_TUTORIALS              36024
 #define ID_DOCUMENTATION_GLOSSARY               36025
-#define ID_DOCUMENTATION_LUMBERYARD             36026
+#define ID_DOCUMENTATION_O3DE                   36026
 #define ID_DOCUMENTATION_GAMELIFT               36027
 #define ID_DOCUMENTATION_RELEASENOTES           36028
 #define ID_DOCUMENTATION_GAMEDEVBLOG            36029