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

5a09d44f

Commit 5a09d44f authored 6 years ago by Alam Ed Arias

Downloads
- Plain Diff

Merge remote-tracking branch 'public/master' into Travis_CI-gcc8

parents 4695841b ab39534e

Branches

Tags

2 merge requests!488Merge in next and don't billboard papersprites in GL,!332WIP: Travis ci gcc8

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

bin/Resources/libgme64.dll 0 additions, 0 deletions

bin/Resources/libgme64.dll
libs/gme/win64/libgme.dll.a 0 additions, 0 deletions

libs/gme/win64/libgme.dll.a
src/Makefile 5 additions, 1 deletion

src/Makefile
src/Makefile.cfg 2 additions, 0 deletions

src/Makefile.cfg
src/hardware/hw_draw.c 6 additions, 6 deletions

src/hardware/hw_draw.c
src/p_setup.c 38 additions, 31 deletions

src/p_setup.c
src/screen.c 4 additions, 1 deletion

src/screen.c
src/win32/Makefile.cfg 5 additions, 0 deletions

src/win32/Makefile.cfg

with 60 additions and 39 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