Merge branch 'fix-1177' into 'next' (36e64cb6) · 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

36e64cb6

Commit 36e64cb6 authored 1 year ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'fix-1177' into 'next'

Fix #1177

Closes #1177

See merge request !2268

parents 0739c310 1d2ea9b0

No related branches found

No related tags found

2 merge requests!2355fix newer versions of mixerx,!2268Fix #1177

Pipeline #2047 passed 1 year ago

Stage: build

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 0 additions, 2 deletions

src/d_player.h
src/hardware/hw_main.c 3 additions, 64 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 0 additions, 1 deletion

src/hardware/hw_main.h
src/lua_playerlib.c 1 addition, 9 deletions

src/lua_playerlib.c
src/p_user.c 1 addition, 3 deletions

src/p_user.c
src/r_main.c 51 additions, 32 deletions

src/r_main.c
src/r_main.h 6 additions, 1 deletion

src/r_main.h
src/r_sky.c 1 addition, 2 deletions

src/r_sky.c

with 63 additions and 114 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