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

536fb1ef

Commit 536fb1ef authored 5 years ago by James R.

Downloads
- Plain Diff

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

parents cbe181c6 b11845b0

Branches

Tags

1 merge request!985Shaders next merge

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/command.c 1 addition, 1 deletion

src/command.c
src/d_clisrv.h 3 additions, 6 deletions

src/d_clisrv.h
src/d_main.c 45 additions, 6 deletions

src/d_main.c
src/dehacked.c 20 additions, 1 deletion

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

src/doomdef.h
src/hardware/hw_main.c 114 additions, 76 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 4 additions, 1 deletion

src/hardware/hw_md2.c
src/i_tcp.c 6 additions, 3 deletions

src/i_tcp.c
src/m_argv.c 19 additions, 0 deletions

src/m_argv.c
src/m_argv.h 3 additions, 0 deletions

src/m_argv.h

with 218 additions and 94 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