Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into toast_slopes (fa58993b) · Commits · Fancy2209 / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

fa58993b

Commit fa58993b authored 8 years ago by toaster

Downloads
- Plain Diff

Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into toast_slopes

# Conflicts:
#	src/p_user.c

parents 11474289 8fc61bb6

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/p_floor.c 5 additions, 5 deletions

src/p_floor.c
src/p_map.c 48 additions, 48 deletions

src/p_map.c
src/p_mobj.c 7 additions, 7 deletions

src/p_mobj.c
src/p_spec.c 12 additions, 12 deletions

src/p_spec.c
src/p_user.c 6 additions, 106 deletions

src/p_user.c
src/r_defs.h 10 additions, 10 deletions

src/r_defs.h

with 88 additions and 188 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