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

7805828c

Commit 7805828c authored 5 years ago by James R.

Downloads
- Plain Diff

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

parents 5a524f21 700d9426

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/am_map.c 98 additions, 24 deletions

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

src/am_map.h
src/console.c 1 addition, 1 deletion

src/console.c
src/d_clisrv.c 6 additions, 0 deletions

src/d_clisrv.c
src/d_netcmd.c 13 additions, 2 deletions

src/d_netcmd.c
src/d_netcmd.h 1 addition, 0 deletions

src/d_netcmd.h
src/m_anigif.c 5 additions, 13 deletions

src/m_anigif.c
src/r_data.c 8 additions, 4 deletions

src/r_data.c
src/r_data.h 2 additions, 1 deletion

src/r_data.h
src/screen.c 5 additions, 2 deletions

src/screen.c
src/v_video.c 1 addition, 2 deletions

src/v_video.c
src/v_video.h 1 addition, 4 deletions

src/v_video.h
src/w_wad.c 8 additions, 8 deletions

src/w_wad.c

with 152 additions and 61 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