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

3ffbc2bb

Commit 3ffbc2bb authored 5 months ago by Alam Ed Arias

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/public_next' into 2214

parents 983453e2 e570328c

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 5 additions, 0 deletions

src/CMakeLists.txt
src/Makefile.d/detect.mk 3 additions, 1 deletion

src/Makefile.d/detect.mk
src/Makefile.d/haiku.mk 71 additions, 0 deletions

src/Makefile.d/haiku.mk
src/Makefile.d/platform.mk 4 additions, 0 deletions

src/Makefile.d/platform.mk
src/Makefile.d/sdl.mk 7 additions, 5 deletions

src/Makefile.d/sdl.mk
src/sdl/i_system.c 1 addition, 1 deletion

src/sdl/i_system.c

with 91 additions and 7 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