Skip to content
Snippets Groups Projects
Commit d0abd6e8 authored by LJ Sonic's avatar LJ Sonic
Browse files

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup 

# Conflicts:
#	src/hardware/hw_main.c
#	src/p_spec.c
parents a06c4a8c 4cd5d760
No related branches found
No related tags found
2 merge requests!985Shaders next merge,!860Encapsulate plane height checks
Hide whitespace changes
Inline Side-by-side
Showing
with 358 additions and 124 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