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

f6a73fbc

Commit f6a73fbc authored 8 years ago by Sal

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/upstream/next' into next

parents ee75cbba 694bb73e

No related branches found

No related tags found

Loading

Changes 33

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/hardware/hw_draw.c 11 additions, 4 deletions

src/hardware/hw_draw.c
src/hardware/hw_main.c 35 additions, 13 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 22 additions, 4 deletions

src/hardware/hw_md2.c
src/hardware/hw_md2.h 1 addition, 0 deletions

src/hardware/hw_md2.h
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/lua_hudlib.c 2 additions, 0 deletions

src/lua_hudlib.c
src/m_cheat.c 1 addition, 1 deletion

src/m_cheat.c
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_map.c 26 additions, 13 deletions

src/p_map.c
src/p_mobj.c 4 additions, 2 deletions

src/p_mobj.c
src/p_setup.c 4 additions, 5 deletions

src/p_setup.c

with 560 additions and 266 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