Merge remote-tracking branch 'origin/master' into png-patches (affff0a7) · 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

affff0a7

Commit affff0a7 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into png-patches

parents ed551f25 440b63ef

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 14 additions, 0 deletions

src/dehacked.c
src/doomstat.h 2 additions, 0 deletions

src/doomstat.h
src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/lua_maplib.c 2 additions, 0 deletions

src/lua_maplib.c
src/m_menu.c 11 additions, 2 deletions

src/m_menu.c
src/p_setup.c 3 additions, 2 deletions

src/p_setup.c
src/s_sound.c 5 additions, 2 deletions

src/s_sound.c
src/s_sound.h 9 additions, 0 deletions

src/s_sound.h

with 47 additions and 7 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