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

4abe112a

Commit 4abe112a authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents 8dd4e47a 8350a8c5

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/console.c 1 addition, 10 deletions

src/console.c
src/d_main.c 2 additions, 4 deletions

src/d_main.c
src/hu_stuff.c 6 additions, 0 deletions

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

src/m_menu.c
src/mserv.c 1 addition, 1 deletion

src/mserv.c
src/p_mobj.c 3 additions, 2 deletions

src/p_mobj.c
src/p_user.c 3 additions, 0 deletions

src/p_user.c

with 20 additions and 17 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