Merge branch 'master-server-2' into 'next' (0f19b135) · Commits · Kart Krew / Kart-Public · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

0f19b135

Commit 0f19b135 authored 4 years ago by James R.

Downloads
- Plain Diff

Merge branch 'master-server-2' into 'next'

Master Server 2

See merge request !224

parents b9310c05 8a687941

No related branches found

No related tags found

1 merge request!224Master Server 2

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 13 additions, 96 deletions

src/d_clisrv.c
src/d_clisrv.h 1 addition, 1 deletion

src/d_clisrv.h
src/d_main.c 0 additions, 12 deletions

src/d_main.c
src/discord.c 7 additions, 8 deletions

src/discord.c
src/doomdef.h 1 addition, 20 deletions

src/doomdef.h
src/http-mserv.c 63 additions, 206 deletions

src/http-mserv.c
src/m_menu.c 195 additions, 319 deletions

src/m_menu.c
src/m_menu.h 0 additions, 4 deletions

src/m_menu.h
src/mserv.c 41 additions, 37 deletions

src/mserv.c
src/mserv.h 5 additions, 23 deletions

src/mserv.h

with 326 additions and 726 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