Merge remote-tracking branch 'origin/master' into tutorial-time (eec3f630) · 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

eec3f630

Commit eec3f630 authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into tutorial-time

parents 15020ae0 e5d16c52

No related branches found

No related tags found

No related merge requests found

Changes 57

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile 14 additions, 7 deletions

src/Makefile
src/android/i_sound.c 43 additions, 45 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/dehacked.c 64 additions, 8 deletions

src/dehacked.c
src/djgppdos/i_sound.c 106 additions, 110 deletions

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

src/doomstat.h
src/dummy/i_sound.c 40 additions, 42 deletions

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

src/hardware/hw3sound.c
src/hardware/hw_main.c 71 additions, 27 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 2 additions, 2 deletions

src/hardware/hw_md2.c
src/i_sound.h 62 additions, 76 deletions

src/i_sound.h
src/i_tcp.c 26 additions, 42 deletions

src/i_tcp.c
src/info.c 542 additions, 20 deletions

src/info.c
src/info.h 55 additions, 0 deletions

src/info.h
src/lua_baselib.c 3 additions, 1 deletion

src/lua_baselib.c
src/lua_mobjlib.c 20 additions, 0 deletions

src/lua_mobjlib.c
src/lua_script.c 7 additions, 5 deletions

src/lua_script.c
src/m_anigif.c 3 additions, 1 deletion

src/m_anigif.c
src/m_menu.c 65 additions, 64 deletions

src/m_menu.c

with 1138 additions and 472 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