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
@@ -15,7 +15,7 @@

 #include <memory>

-namespace Lumberyard
+namespace O3de
 {
    FileStreamDataSource::FileStreamDataSource(const base::FilePath& filePath) :
        m_filePath{ filePath }