Merge branch 'master' into floatcvt

2016-03-28 22:53:26 +02:00 · 2016-03-28 22:53:26 +02:00 · 0a238e7e18
commit 0a238e7e18
parent 0283df4c42 a92de84cf7
3 changed files with 3 additions and 0 deletions
--- a/src/p_lnspec.cpp
+++ b/src/p_lnspec.cpp
@ -51,6 +51,7 @@
 #include "gi.h"
 #include "m_random.h"
 #include "p_conversation.h"
+#include "a_strifeglobal.h"
 #include "r_data/r_translate.h"
 #include "p_3dmidtex.h"
 #include "d_net.h"