Merge branch 'master' into floatcvt
# Conflicts: # src/p_spec.cpp # src/p_spec.h
This commit is contained in:
commit
d87f861e87
15 changed files with 6 additions and 445 deletions
|
|
@ -33,7 +33,6 @@
|
|||
#include "v_video.h"
|
||||
#include "doomstat.h"
|
||||
#include "st_stuff.h"
|
||||
#include "a_hexenglobal.h"
|
||||
#include "g_game.h"
|
||||
#include "g_level.h"
|
||||
#include "r_data/r_translate.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue