Merge branch 'development' into Prefab/SaveAllPrefabs

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-02 23:40:54 -07:00
parent 5a8998add1 daf901e809
commit fbf92e9775
2357 changed files with 473642 additions and 159101 deletions
@@ -35,7 +35,6 @@
 #include "CryEdit.h"
 #include "MainWindow.h"

-#pragma comment(lib, "Gdi32.lib")

 //////////////////////////////////////////////////////////////////////////
 // Global Instance of Editor settings.