Skip to content
Snippets Groups Projects
Commit c5a97dcf authored by SteelT's avatar SteelT
Browse files

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit

parents 4836e711 3e6fcf1b
No related branches found
No related tags found
2 merge requests!488Merge in next and don't billboard papersprites in GL,!329MinGW: Fix compiling on 64-bit Windows.
Hide whitespace changes
Inline Side-by-side
Showing
with 266 additions and 178 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment