Merge branch 'public_next' (b5c4b476) · 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

b5c4b476

Commit b5c4b476 authored 6 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'public_next'

# Conflicts:
#	src/d_main.c
#	src/m_menu.c
#	src/s_sound.c
#	src/sdl/sdl_sound.c

parents b1552fad d57c54f9

No related branches found

No related tags found

No related merge requests found

Changes 18

Hide whitespace changes

Inline Side-by-side

Showing

src/android/i_sound.c 41 additions, 44 deletions

src/android/i_sound.c
src/d_main.c 11 additions, 14 deletions

src/d_main.c
src/d_netcmd.c 2 additions, 3 deletions

src/d_netcmd.c
src/djgppdos/i_sound.c 103 additions, 109 deletions

src/djgppdos/i_sound.c
src/doomstat.h 1 addition, 4 deletions

src/doomstat.h
src/dummy/i_sound.c 38 additions, 41 deletions

src/dummy/i_sound.c
src/hardware/hw3sound.c 1 addition, 1 deletion

src/hardware/hw3sound.c
src/i_sound.h 61 additions, 75 deletions

src/i_sound.h
src/m_menu.c 65 additions, 64 deletions

src/m_menu.c
src/p_mobj.c 1 addition, 1 deletion

src/p_mobj.c
src/s_sound.c 225 additions, 153 deletions

src/s_sound.c
src/s_sound.h 34 additions, 7 deletions

src/s_sound.h
src/sdl/i_video.c 2 additions, 2 deletions

src/sdl/i_video.c
src/sdl/mixer_sound.c 173 additions, 194 deletions

src/sdl/mixer_sound.c
src/sdl/sdl_sound.c 89 additions, 586 deletions

src/sdl/sdl_sound.c
src/win32/win_cd.c 1 addition, 1 deletion

src/win32/win_cd.c
src/win32/win_main.c 2 additions, 2 deletions

src/win32/win_main.c
src/win32/win_snd.c 197 additions, 202 deletions

src/win32/win_snd.c

with 1047 additions and 1503 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