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

2017-01-18 05:19:34 -05:00 · 2017-01-18 05:19:34 -05:00 · 590781d4a6
commit 590781d4a6
parent 53a79ca215 cfdd580044
22 changed files with 65 additions and 187 deletions
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@ -66,7 +66,6 @@
 #include "gstrings.h"

 #include "am_map.h"
-#include "a_artifacts.h"
 #include "po_man.h"
 #include "a_keys.h"
 #include "r_data/colormaps.h"