Skip to content
Snippets Groups Projects
Commit b48c1d1c authored by Nev3r's avatar Nev3r
Browse files

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

# Conflicts:
#	src/w_wad.c
parents 7dd6692f 1113849f
Branches
Tags
1 merge request!488Merge in next and don't billboard papersprites in GL
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment