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

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

# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h
parents b85ac653 3e02f5d0
No related branches found
No related tags found
1 merge request!829Resend gamestate when resynching
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2238 additions and 549 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