Merge https://github.com/coelckers/gzdoom

2017-04-12 20:33:38 -04:00 · 2017-04-12 20:33:38 -04:00 · a15031706d
commit a15031706d
parent fb38fa2eea 1712667ce2
128 changed files with 5355 additions and 5094 deletions
--- a/src/gi.cpp
+++ b/src/gi.cpp
@ -42,6 +42,7 @@
 #include "i_system.h"
 #include "v_video.h"
 #include "g_level.h"
+#include "vm.h"

 gameinfo_t gameinfo;