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
@@ -217,7 +217,7 @@ public:
 ToolbarManager::ToolbarManager(ActionManager* actionManager, MainWindow* mainWindow)
    : m_mainWindow(mainWindow)
    , m_actionManager(actionManager)
-    , m_settings("amazon", "lumberyard")
+    , m_settings("amazon", "O3DE")
    , m_expanderWatcher(new AmazonToolBarExpanderWatcher())
 {
    // Note that we don't actually save/load from AmazonToolbar::List