Merge branch 'musicplus-core' into musicplus-fade-sdltimer (3bd3e513) · 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

3bd3e513

Commit 3bd3e513 authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge branch 'musicplus-core' into musicplus-fade-sdltimer

# Conflicts:
#	src/sdl/mixer_sound.c

parents 34872bc1 3e7d7cfc

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/android/i_sound.c 20 additions, 4 deletions

src/android/i_sound.c
src/djgppdos/i_sound.c 22 additions, 6 deletions

src/djgppdos/i_sound.c
src/dummy/i_sound.c 20 additions, 4 deletions

src/dummy/i_sound.c
src/i_sound.h 23 additions, 6 deletions

src/i_sound.h
src/lua_baselib.c 70 additions, 23 deletions

src/lua_baselib.c
src/s_sound.c 21 additions, 6 deletions

src/s_sound.c
src/s_sound.h 13 additions, 3 deletions

src/s_sound.h
src/sdl/mixer_sound.c 313 additions, 65 deletions

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

src/sdl/sdl_sound.c
src/win32/win_snd.c 25 additions, 5 deletions

src/win32/win_snd.c

with 548 additions and 128 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