Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal (1ff498fc) · 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

1ff498fc

Commit 1ff498fc authored 8 years ago by Inuyasha

Downloads
- Plain Diff

Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal

# Conflicts:
#	src/console.c

parents 1b6c1a02 6c40eb5c

No related branches found

No related tags found

No related merge requests found

Changes 20

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/android/i_system.c 12 additions, 0 deletions

src/android/i_system.c
src/console.c 356 additions, 201 deletions

src/console.c
src/console.h 3 additions, 4 deletions

src/console.h
src/d_main.c 36 additions, 0 deletions

src/d_main.c
src/djgppdos/i_system.c 12 additions, 0 deletions

src/djgppdos/i_system.c
src/doomdef.h 3 additions, 0 deletions

src/doomdef.h
src/dummy/i_system.c 12 additions, 0 deletions

src/dummy/i_system.c
src/hu_stuff.c 0 additions, 7 deletions

src/hu_stuff.c
src/i_system.h 8 additions, 0 deletions

src/i_system.h
src/m_menu.c 0 additions, 12 deletions

src/m_menu.c
src/nds/i_system.c 12 additions, 0 deletions

src/nds/i_system.c
src/p_setup.c 1 addition, 1 deletion

src/p_setup.c
src/sdl/i_system.c 41 additions, 0 deletions

src/sdl/i_system.c
src/sdl/ogl_sdl.h 0 additions, 1 deletion

src/sdl/ogl_sdl.h
src/sdl/sdlmain.h 3 additions, 0 deletions

src/sdl/sdlmain.h
src/sdl12/i_system.c 12 additions, 0 deletions

src/sdl12/i_system.c
src/v_video.c 55 additions, 54 deletions

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

src/v_video.h
src/win32/win_sys.c 12 additions, 0 deletions

src/win32/win_sys.c
src/win32ce/win_sys.c 12 additions, 0 deletions

src/win32ce/win_sys.c

with 591 additions and 281 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