Merge remote-tracking branch 'origin/master' into next (5b0cb1af) · Commits · Andrew Bradley / Kart-Public · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Kart-Public
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

5b0cb1af

Commit 5b0cb1af authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into next

parents ed41d5df 79c299bf

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 16 additions, 9 deletions

src/d_clisrv.c
src/d_net.h 2 additions, 0 deletions

src/d_net.h
src/doomdef.h 6 additions, 0 deletions

src/doomdef.h
src/http-mserv.c 8 additions, 0 deletions

src/http-mserv.c
src/i_tcp.c 23 additions, 12 deletions

src/i_tcp.c
src/m_menu.c 18 additions, 9 deletions

src/m_menu.c
src/mserv.c 43 additions, 22 deletions

src/mserv.c
src/p_user.c 12 additions, 9 deletions

src/p_user.c
src/sdl/mixer_sound.c 29 additions, 94 deletions

src/sdl/mixer_sound.c
src/w_wad.c 4 additions, 1 deletion

src/w_wad.c

with 161 additions and 156 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment