Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors (1a4b8945) · 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

1a4b8945

Commit 1a4b8945 authored 8 years ago by Inuyasha

Downloads
- Plain Diff

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors

# Conflicts:
#	src/info.c

parents 0c8fcb5e 31b9e762

No related branches found

No related tags found

No related merge requests found

Changes 81

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 23 additions, 23 deletions

.travis.yml
README.md 22 additions, 0 deletions

README.md
SRB2.cbp 33 additions, 0 deletions

SRB2.cbp
appveyor.yml 1 addition, 1 deletion

appveyor.yml
readme.txt 0 additions, 155 deletions

readme.txt
src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 14 additions, 0 deletions

src/Makefile
src/Makefile.cfg 9 additions, 0 deletions

src/Makefile.cfg
src/blua/lvm.c 2 additions, 1 deletion

src/blua/lvm.c
src/command.c 4 additions, 2 deletions

src/command.c
src/d_clisrv.c 2 additions, 0 deletions

src/d_clisrv.c
src/d_clisrv.h 1 addition, 0 deletions

src/d_clisrv.h
src/d_main.c 4 additions, 3 deletions

src/d_main.c
src/d_main.h 1 addition, 1 deletion

src/d_main.h
src/d_player.h 4 additions, 1 deletion

src/d_player.h
src/dehacked.c 82 additions, 6 deletions

src/dehacked.c
src/doomdef.h 8 additions, 1 deletion

src/doomdef.h
src/doomtype.h 1 addition, 1 deletion

src/doomtype.h
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/f_finale.h 1 addition, 1 deletion

src/f_finale.h

with 215 additions and 197 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