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

2cdfb8ff

Commit 2cdfb8ff authored 4 years ago by Nev3r

Downloads
- Plain Diff

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next

parents a9dbf6da 84373b17

Branches

No related tags found

1 merge request!1075Merge udmf-next into next

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/hardware/hw_cache.c 8 additions, 8 deletions

src/hardware/hw_cache.c
src/hardware/hw_glob.h 1 addition, 0 deletions

src/hardware/hw_glob.h
src/hardware/hw_main.c 187 additions, 10 deletions

src/hardware/hw_main.c
src/r_data.c 42 additions, 6 deletions

src/r_data.c
src/r_data.h 4 additions, 1 deletion

src/r_data.h

with 242 additions and 25 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