Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -192,7 +192,6 @@ void CLogFile::AboutSystem()
    char szProfileBuffer[128];
    char szLanguageBuffer[64];
    //char szCPUModel[64];
-    char* pChar = 0;
    MEMORYSTATUS MemoryStatus;
 #endif // defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)