Merge remote-tracking branch 'origin/master' into wipes2

This commit is contained in:
Jaime Passos 2019-12-05 16:26:50 -03:00
commit 7765dd538c
1 changed files with 1 additions and 0 deletions

View File

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