Merge branch 'master' of c:\programming\doom-dev\zdoom

# Conflicts: # .gitignore
2016-02-16 21:02:13 +01:00 · 2016-02-16 21:02:13 +01:00 · 56202c49f1
commit 56202c49f1
parent c69fd3ac80 45108e9bb8
84 changed files with 1245 additions and 587 deletions
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@ -83,6 +83,8 @@
 #include "r_data/colormaps.h"
 #include "farchive.h"
 #include "r_renderer.h"
+#include "r_utility.h"
+#include "p_spec.h"

 #include "gi.h"