Merge remote-tracking branch 'origin/master' into next (42380038) · Commits · SteelT / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

42380038

Commit 42380038 authored 5 years ago by James R.

Downloads
- Plain Diff

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

parents d7fcd338 aad4b6f8

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/f_finale.c 12 additions, 13 deletions

src/f_finale.c
src/hardware/hw_main.c 6 additions, 38 deletions

src/hardware/hw_main.c
src/hu_stuff.c 12 additions, 3 deletions

src/hu_stuff.c
src/m_menu.c 6 additions, 3 deletions

src/m_menu.c
src/p_user.c 13 additions, 2 deletions

src/p_user.c
src/r_main.c 27 additions, 28 deletions

src/r_main.c
src/r_state.h 1 addition, 0 deletions

src/r_state.h
src/r_things.c 55 additions, 38 deletions

src/r_things.c
src/r_things.h 9 additions, 0 deletions

src/r_things.h

with 141 additions and 125 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