Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2019-12-05 10:52:17 -05:00
commit b1571f81b1

View file

@ -32,6 +32,7 @@
#include "SDL.h"
#ifdef _MSC_VER
#include <windows.h>
#pragma warning(default : 4214 4244)
#endif