Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

This commit is contained in:
chcurran
2021-08-11 14:48:24 -07:00
662 changed files with 9938 additions and 20306 deletions
@@ -8,6 +8,7 @@
#include "RecentFiles.h"
#include "CommonSettingsConfigurations.h"
#include <AzCore/std/algorithm.h>
#include <QDir>
#include <QSettings>