Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next (60aa0f82) · 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

60aa0f82

Commit 60aa0f82 authored 4 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next

parents 650f4456 24df9f03

No related branches found

No related tags found

1 merge request!985Shaders next merge

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