Skip to content
Snippets Groups Projects
Commit 6af56273 authored by Sryder's avatar Sryder
Browse files

Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge 

# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
parents e1a28bbe fced19d2
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 996 additions and 406 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