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

6a4bbfb2

Commit 6a4bbfb2 authored 9 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git

parents ed955a2d b6195905

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 1 deletion

.travis.yml
src/dehacked.c 0 additions, 2 deletions

src/dehacked.c
src/doomdef.h 0 additions, 7 deletions

src/doomdef.h
src/hardware/hw_glob.h 0 additions, 2 deletions

src/hardware/hw_glob.h
src/hardware/hw_main.c 2 additions, 19 deletions

src/hardware/hw_main.c
src/info.c 0 additions, 2 deletions

src/info.c
src/info.h 0 additions, 2 deletions

src/info.h
src/lua_script.h 11 additions, 0 deletions

src/lua_script.h
src/p_inter.c 1 addition, 6 deletions

src/p_inter.c
src/p_mobj.c 0 additions, 18 deletions

src/p_mobj.c
src/p_spec.c 0 additions, 25 deletions

src/p_spec.c
src/p_user.c 1 addition, 4 deletions

src/p_user.c
src/r_defs.h 0 additions, 8 deletions

src/r_defs.h

with 16 additions and 96 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