Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next (eb8cb12b) · 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

eb8cb12b

Commit eb8cb12b authored 5 years ago by Sryder

Downloads
- Plain Diff

Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next

parents 64ddbdc7 3cd5b3a3

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/command.c 4 additions, 1 deletion

src/command.c
src/d_clisrv.c 8 additions, 2 deletions

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

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

src/d_netcmd.c
src/d_netfil.c 2 additions, 1 deletion

src/d_netfil.c
src/doomdef.h 3 additions, 0 deletions

src/doomdef.h
src/g_game.c 9 additions, 6 deletions

src/g_game.c
src/hardware/hw_main.c 179 additions, 139 deletions

src/hardware/hw_main.c
src/i_tcp.c 1 addition, 1 deletion

src/i_tcp.c
src/m_menu.c 5 additions, 1 deletion

src/m_menu.c
src/mserv.c 36 additions, 27 deletions

src/mserv.c

with 249 additions and 180 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