Merge branch 'master' into next (ef53672d) · 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

ef53672d

Commit ef53672d authored 5 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' into next

# Conflicts:
#	src/g_game.c

parents 842099b7 9d9c685d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 10 additions, 5 deletions

appveyor.yml
src/d_main.c 7 additions, 1 deletion

src/d_main.c
src/g_input.c 7 additions, 1 deletion

src/g_input.c
src/m_menu.c 6 additions, 0 deletions

src/m_menu.c
src/m_menu.h 3 additions, 0 deletions

src/m_menu.h
src/p_setup.c 19 additions, 20 deletions

src/p_setup.c
src/sdl/i_video.c 16 additions, 6 deletions

src/sdl/i_video.c

with 68 additions and 33 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