Merge remote-tracking branch 'origin/next' into next (d9742afb) · 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

d9742afb

Commit d9742afb authored 5 years ago by Alam Ed Arias

Downloads
- Plain Diff

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

parents f93ddc3f 709489ca

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 1 addition, 0 deletions

src/d_clisrv.c
src/d_main.c 0 additions, 2 deletions

src/d_main.c
src/doomdef.h 2 additions, 2 deletions

src/doomdef.h
src/m_menu.c 2 additions, 1 deletion

src/m_menu.c
src/m_misc.c 11 additions, 7 deletions

src/m_misc.c
src/p_user.c 7 additions, 0 deletions

src/p_user.c
src/r_data.c 224 additions, 208 deletions

src/r_data.c
src/s_sound.c 8 additions, 0 deletions

src/s_sound.c
src/s_sound.h 2 additions, 0 deletions

src/s_sound.h

with 257 additions and 220 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