Merge remote-tracking branch 'origin/master' into software-clownery (590d6729) · 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

590d6729

Commit 590d6729 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into software-clownery

parents 2f4c270a c27d062c

No related branches found

No related tags found

2 merge requests!734Rebase Keycodes only branch.,!578Software clownery

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 2 additions, 2 deletions

extras/conf/SRB2-22.cfg
src/doomdef.h 1 addition, 1 deletion

src/doomdef.h
src/g_game.c 6 additions, 6 deletions

src/g_game.c
src/m_menu.c 4 additions, 2 deletions

src/m_menu.c
src/m_misc.c 91 additions, 0 deletions

src/m_misc.c
src/m_misc.h 5 additions, 0 deletions

src/m_misc.h
src/p_inter.c 3 additions, 3 deletions

src/p_inter.c
src/p_local.h 2 additions, 2 deletions

src/p_local.h
src/p_user.c 3 additions, 0 deletions

src/p_user.c
src/r_main.c 2 additions, 0 deletions

src/r_main.c
src/sdl/i_main.c 73 additions, 16 deletions

src/sdl/i_main.c
src/sdl/i_system.c 45 additions, 0 deletions

src/sdl/i_system.c

with 237 additions and 32 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