Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext

# Conflicts:
#	src/w_wad.c
This commit is contained in:
Nev3r 2018-11-25 11:18:28 +01:00
commit b48c1d1ce6

View file

@ -214,4 +214,4 @@ void M_FindResponseFile(void)
break; break;
} }
} }