Skip to content
Snippets Groups Projects
Commit e34ef541 authored by toaster's avatar toaster
Browse files

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into...

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_alignment_revamp

# Conflicts:
#	src/info.c
#	src/p_mobj.c
parents 041347bb eab2df56
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment