OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into openal

Browse source 
Conflicts:
	src/CMakeLists.txt
This commit is contained in:
Chris Robinson 2014-06-15 12:04:15 -07:00
commit 7ff7c151a8
433 changed files with 11683 additions and 6017 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/menu/menudef.cpp
View file

@ -160,7 +160,7 @@ static bool CheckSkipOptionBlock(FScanner &sc)
}
else if (sc.Compare("unix"))
{
#ifdef unix
#ifdef __unix__
filter = true;
#endif
}