OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch '3.0_work'

Browse source 
# Conflicts:
#	src/gl/scene/gl_portal.cpp
#	src/r_plane.cpp
This commit is contained in:
Christoph Oelckers 2017-03-12 20:31:34 +01:00
commit 61c91f05fc
552 changed files with 58244 additions and 23521 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/scripting/zscript/ast.cpp
View file

@ -44,7 +44,7 @@ static const char *BuiltInTypeNames[] =
{
"sint8", "uint8",
"sint16", "uint16",
"sint32", "uint32",
"sint32", "uint32_t",
"intauto",
"bool",