Merge branch 'rotsprite_i' of... (278ddcf7) · 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

278ddcf7

Commit 278ddcf7 authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'rotsprite_i' of...

Merge branch 'rotsprite_i' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rotsprite_toast

parents afe28b0a 8506d420

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 13 additions, 2 deletions

src/dehacked.c
src/lua_infolib.c 12 additions, 5 deletions

src/lua_infolib.c
src/p_setup.c 0 additions, 14 deletions

src/p_setup.c
src/r_patch.c 31 additions, 4 deletions

src/r_patch.c
src/r_patch.h 2 additions, 1 deletion

src/r_patch.h
src/r_things.c 2 additions, 2 deletions

src/r_things.c

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