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

1c314833

Commit 1c314833 authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge branch 'musicplus-core' into musicplus-feature-postboss

parents b55191f0 1da3b921

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 3 additions, 1 deletion

src/dehacked.c
src/p_inter.c 4 additions, 6 deletions

src/p_inter.c
src/p_lights.c 1 addition, 1 deletion

src/p_lights.c
src/p_saveg.c 84 additions, 1 deletion

src/p_saveg.c
src/p_setup.c 1 addition, 0 deletions

src/p_setup.c
src/p_spec.c 642 additions, 1 deletion

src/p_spec.c
src/p_spec.h 28 additions, 0 deletions

src/p_spec.h
src/p_user.c 16 additions, 5 deletions

src/p_user.c
src/r_defs.h 5 additions, 0 deletions

src/r_defs.h
src/sdl/mixer_sound.c 7 additions, 0 deletions

src/sdl/mixer_sound.c
src/y_inter.c 35 additions, 3 deletions

src/y_inter.c

with 826 additions and 18 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