src/d_net.c · c51c478740d1bb22dbe0a28923c433038ec76cfc · STJr / SRB2 · GitLab

Snippets Groups Projects

4 years ago
9dd5c113
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate · 9dd5c113
LJ Sonic authored 4 years ago
```
# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h
```
9dd5c113

History
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
LJ Sonic authored 4 years ago
```
# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h
```