Merge remote-tracking branch 'origin/master' into next (aca39d62) · 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

aca39d62

Commit aca39d62 authored 5 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into next

parents 2fda89f1 b029ccff

No related branches found

No related tags found

Loading

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

src/android/i_video.c 4 additions, 6 deletions

src/android/i_video.c
src/console.c 47 additions, 13 deletions

src/console.c
src/d_main.c 2 additions, 3 deletions

src/d_main.c
src/djgppdos/i_video.c 1 addition, 4 deletions

src/djgppdos/i_video.c
src/djgppdos/vid_vesa.c 2 additions, 4 deletions

src/djgppdos/vid_vesa.c
src/dummy/i_video.c 4 additions, 6 deletions

src/dummy/i_video.c
src/hardware/hw_draw.c 2 additions, 2 deletions

src/hardware/hw_draw.c
src/hardware/hw_main.c 9 additions, 7 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 2 additions, 2 deletions

src/hardware/hw_md2.c
src/i_video.h 11 additions, 7 deletions

src/i_video.h
src/m_fixed.h 14 additions, 2 deletions

src/m_fixed.h
src/m_menu.c 23 additions, 10 deletions

src/m_menu.c
src/screen.c 2 additions, 2 deletions

src/screen.c
src/sdl/i_video.c 69 additions, 31 deletions

src/sdl/i_video.c
src/w_wad.c 52 additions, 33 deletions

src/w_wad.c
src/w_wad.h 9 additions, 2 deletions

src/w_wad.h
src/win32/win_vid.c 3 additions, 8 deletions

src/win32/win_vid.c

with 256 additions and 142 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