Merge branch 'master' into automap_fix (1d40676f) · 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

1d40676f

Unverified Commit 1d40676f authored 6 years ago by Jimita Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into automap_fix

parents d70dbada 6b1b1144

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

debian/rules 2 additions, 1 deletion

debian/rules
src/dehacked.c 1 addition, 0 deletions

src/dehacked.c
src/hardware/hw_bsp.c 118 additions, 128 deletions

src/hardware/hw_bsp.c
src/sdl/mixer_sound.c 6 additions, 0 deletions

src/sdl/mixer_sound.c
src/sdl/sdl_sound.c 6 additions, 0 deletions

src/sdl/sdl_sound.c

with 133 additions and 129 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