Merge branch 'master' into next (b2226e95) · Commits · Golden / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

b2226e95

Commit b2226e95 authored 4 years ago by James R.

Downloads
- Plain Diff

Merge branch 'master' into next

parents 9a1d6e0d e5936108

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile 0 additions, 23 deletions

src/Makefile
src/d_main.c 2 additions, 0 deletions

src/d_main.c
src/doomdef.h 0 additions, 6 deletions

src/doomdef.h
src/sdl/Makefile.cfg 0 additions, 22 deletions

src/sdl/Makefile.cfg
src/sdl/i_video.c 1 addition, 0 deletions

src/sdl/i_video.c
src/sdl/mixer_sound.c 2 additions, 0 deletions

src/sdl/mixer_sound.c

with 5 additions and 51 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