Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss (1e702443) · Commits · AJ Martinez / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Model experiments

Snippets Groups Projects

1e702443

Commit 1e702443 authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss

parents 03367bdc 119cf494

No related branches found

No related tags found

No related merge requests found

Changes 78

Expand all Hide whitespace changes

Inline Side-by-side

Showing

README.md 0 additions, 2 deletions

README.md
src/Makefile 14 additions, 7 deletions

src/Makefile
src/android/i_sound.c 2 additions, 1 deletion

src/android/i_sound.c
src/byteptr.h 5 additions, 3 deletions

src/byteptr.h
src/command.c 12 additions, 0 deletions

src/command.c
src/console.c 32 additions, 8 deletions

src/console.c
src/console.h 2 additions, 0 deletions

src/console.h
src/d_clisrv.c 15 additions, 2 deletions

src/d_clisrv.c
src/d_clisrv.h 11 additions, 0 deletions

src/d_clisrv.h
src/d_main.c 16 additions, 5 deletions

src/d_main.c
src/d_main.h 2 additions, 2 deletions

src/d_main.h
src/d_netcmd.c 11 additions, 101 deletions

src/d_netcmd.c
src/d_netcmd.h 1 addition, 5 deletions

src/d_netcmd.h
src/dehacked.c 448 additions, 17 deletions

src/dehacked.c
src/djgppdos/i_sound.c 14 additions, 13 deletions

src/djgppdos/i_sound.c
src/doomdef.h 7 additions, 0 deletions

src/doomdef.h
src/doomstat.h 62 additions, 0 deletions

src/doomstat.h
src/doomtype.h 105 additions, 85 deletions

src/doomtype.h
src/dummy/i_sound.c 5 additions, 4 deletions

src/dummy/i_sound.c
src/f_finale.c 631 additions, 1 deletion

src/f_finale.c

with 1395 additions and 256 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