OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into floatcvt

Browse source 
# Conflicts:
#	src/p_spec.cpp
#	src/p_spec.h
This commit is contained in:
Christoph Oelckers 2016-03-28 22:23:41 +02:00
commit d87f861e87
15 changed files with 6 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/fragglescript/t_func.cpp
View file

@ -56,7 +56,6 @@
#include "c_console.h"
#include "c_dispatch.h"
#include "d_player.h"
#include "a_doomglobal.h"
#include "w_wad.h"
#include "gi.h"
#include "zstring.h"