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/g_shared/a_pickups.cpp
View file

@ -11,7 +11,6 @@
#include "c_dispatch.h"
#include "gstrings.h"
#include "templates.h"
#include "a_strifeglobal.h"
#include "a_morph.h"
#include "a_specialspot.h"
#include "thingdef/thingdef.h"