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
@@ -16,7 +16,7 @@
 #include <handler/user_stream_data_source.h>
 #include "base/files/file_path.h"

-namespace Lumberyard
+namespace O3de
 {
    class FileStreamDataSource : public crashpad::UserStreamDataSource
    {