Merge branch 'public_next' (14d49b8b) · Commits · STJr / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

14d49b8b

Commit 14d49b8b authored 6 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'public_next'

# Conflicts:
#	src/d_main.c
#	src/d_netfil.c
#	src/p_setup.c

parents 90d6f1d5 bf042ed8

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 1 addition, 1 deletion

src/d_clisrv.c
src/d_main.c 12 additions, 10 deletions

src/d_main.c
src/d_netfil.c 29 additions, 7 deletions

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

src/g_game.c
src/hardware/hw_main.c 11 additions, 5 deletions

src/hardware/hw_main.c
src/m_fixed.c 3 additions, 1 deletion

src/m_fixed.c
src/m_menu.c 7 additions, 0 deletions

src/m_menu.c
src/p_floor.c 14 additions, 0 deletions

src/p_floor.c
src/p_setup.c 12 additions, 8 deletions

src/p_setup.c
src/p_spec.c 27 additions, 0 deletions

src/p_spec.c
src/p_tick.c 2 additions, 1 deletion

src/p_tick.c
src/p_user.c 9 additions, 1 deletion

src/p_user.c
src/sdl/i_video.c 8 additions, 0 deletions

src/sdl/i_video.c
src/sdl/sdl_sound.c 0 additions, 9 deletions

src/sdl/sdl_sound.c
src/st_stuff.c 5 additions, 5 deletions

src/st_stuff.c

with 142 additions and 49 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