Merge branch 'master' into floatcvt

# Conflicts: # src/p_spec.cpp # src/p_spec.h
2016-03-28 22:23:41 +02:00 · 2016-03-28 22:23:41 +02:00 · d87f861e87
commit d87f861e87
parent 05504b65d2 263051a77b
15 changed files with 6 additions and 445 deletions
--- a/src/g_shared/shared_sbar.cpp
+++ b/src/g_shared/shared_sbar.cpp
@ -52,7 +52,6 @@
 #include "v_palette.h"
 #include "d_player.h"
 #include "farchive.h"
-#include "a_hexenglobal.h"
 #include "gstrings.h"

 #include "../version.h"