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

Merge branch 'new_spriteframe_angle' of... 

Merge branch 'new_spriteframe_angle' of http://git.magicalgirl.moe/STJr/SRB2.git into public_flatsprite

# Conflicts:
#	src/r_things.c
parents 2a74ea07 60c91f12
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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