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

51a5ece2

Commit 51a5ece2 authored 4 years ago by lachwright

Downloads
- Plain Diff

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

parents 05ea95d0 24df9f03

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/hardware/hw_main.c 7 additions, 7 deletions

src/hardware/hw_main.c
src/r_patch.c 10 additions, 4 deletions

src/r_patch.c
src/r_things.c 15 additions, 15 deletions

src/r_things.c
src/s_sound.c 1 addition, 1 deletion

src/s_sound.c
src/w_wad.c 4 additions, 0 deletions

src/w_wad.c
src/win32/win_sys.c 3 additions, 1 deletion

src/win32/win_sys.c
src/win32/win_vid.c 5 additions, 1 deletion

src/win32/win_vid.c

with 45 additions and 29 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