Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into charabilities_mk3 (3efa66d5) · 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

3efa66d5

Commit 3efa66d5 authored 8 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into charabilities_mk3

# Conflicts:
#	src/m_menu.c

parents 76b56a02 8fdbc566

No related branches found

No related tags found

No related merge requests found

Changes 16

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/command.c 12 additions, 19 deletions

src/command.c
src/d_netcmd.c 21 additions, 20 deletions

src/d_netcmd.c
src/dehacked.c 15 additions, 0 deletions

src/dehacked.c
src/doomstat.h 4 additions, 1 deletion

src/doomstat.h
src/g_game.c 9 additions, 6 deletions

src/g_game.c
src/g_game.h 1 addition, 1 deletion

src/g_game.h
src/hardware/hw_draw.c 6 additions, 2 deletions

src/hardware/hw_draw.c
src/m_menu.c 1095 additions, 413 deletions

src/m_menu.c
src/m_menu.h 30 additions, 5 deletions

src/m_menu.h
src/p_setup.c 2 additions, 0 deletions

src/p_setup.c
src/sdl/i_video.c 1 addition, 1 deletion

src/sdl/i_video.c
src/sdl12/i_video.c 1 addition, 1 deletion

src/sdl12/i_video.c
src/v_video.c 28 additions, 13 deletions

src/v_video.c
src/v_video.h 1 addition, 0 deletions

src/v_video.h
src/win32/win_vid.c 1 addition, 1 deletion

src/win32/win_vid.c
src/y_inter.c 1 addition, 2 deletions

src/y_inter.c

with 1228 additions and 485 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