Merge branch 'virtres' of https://git.magicalgirl.moe/STJr/SRB2/ into virtres

Browse source

# Conflicts:
#	src/p_setup.c

...

This commit is contained in:

Nev3r 2019-12-11 14:44:42 +01:00

parent a87a9e6ff6 f7c69f0c1c

commit 4d3ec6db41

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available