Merge remote-tracking branch 'upstream/master' into gme-pause (8aee862f) · 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

8aee862f

Commit 8aee862f authored 6 years ago by SteelT

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into gme-pause

parents 77362c45 03e2a2b4

No related branches found

No related tags found

2 merge requests!488Merge in next and don't billboard papersprites in GL,!251Fix pausing on gme

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/d_main.c 1 addition, 6 deletions

src/d_main.c
src/hardware/hw_main.c 11 additions, 5 deletions

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

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

src/m_menu.c
src/p_setup.c 1 addition, 6 deletions

src/p_setup.c
src/sdl/i_video.c 8 additions, 0 deletions

src/sdl/i_video.c
src/st_stuff.c 5 additions, 5 deletions

src/st_stuff.c

with 30 additions and 24 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