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

f24302ad

Commit f24302ad authored 8 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into charabilities_mk3

parents 59bc0da0 a979b425

Branches

Tags

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 1 addition, 1 deletion

src/dehacked.c
src/hu_stuff.c 0 additions, 15 deletions

src/hu_stuff.c
src/r_data.c 132 additions, 9 deletions

src/r_data.c
src/r_data.h 5 additions, 0 deletions

src/r_data.h
src/st_stuff.c 12 additions, 9 deletions

src/st_stuff.c
src/w_wad.c 19 additions, 9 deletions

src/w_wad.c

with 169 additions and 43 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