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

be5d0406

Commit be5d0406 authored 6 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'public_next'

# Conflicts:
#	src/hardware/hw_md2.c

parents b74c01b3 74646052

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile 3 additions, 1 deletion

src/Makefile
src/d_clisrv.c 2 additions, 3 deletions

src/d_clisrv.c
src/d_main.c 0 additions, 9 deletions

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

src/d_netcmd.c
src/f_finale.c 0 additions, 1 deletion

src/f_finale.c
src/hardware/hw_main.c 26 additions, 16 deletions

src/hardware/hw_main.c
src/lua_consolelib.c 3 additions, 1 deletion

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

src/m_menu.c
src/m_misc.c 3 additions, 1 deletion

src/m_misc.c
src/sdl/mixer_sound.c 6 additions, 2 deletions

src/sdl/mixer_sound.c

with 54 additions and 37 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