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

# Conflicts: # src/v_video.cpp
2016-12-06 18:19:08 -05:00 · 2016-12-06 18:19:08 -05:00 · a78b713f4b
commit a78b713f4b
parent 3fd4d00a77 6271ecf2af
701 changed files with 75679 additions and 59327 deletions
--- a/src/win32/fb_d3d9.cpp
+++ b/src/win32/fb_d3d9.cpp
@ -91,7 +91,7 @@

 // TYPES -------------------------------------------------------------------

-IMPLEMENT_CLASS(D3DFB)
+IMPLEMENT_CLASS(D3DFB, false, false)

 struct D3DFB::PackedTexture
 {