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

00ceca8c

Commit 00ceca8c authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into next

parents 42b0ab18 6f8dfb6f

Branches

Tags

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 5 additions, 1 deletion

CMakeLists.txt
src/Makefile.cfg 1 addition, 1 deletion

src/Makefile.cfg
src/d_clisrv.c 2 additions, 2 deletions

src/d_clisrv.c
src/d_main.c 22 additions, 0 deletions

src/d_main.c
src/dehacked.c 0 additions, 2 deletions

src/dehacked.c
src/doomdef.h 6 additions, 18 deletions

src/doomdef.h
src/doomtype.h 4 additions, 0 deletions

src/doomtype.h
src/lua_script.c 6 additions, 0 deletions

src/lua_script.c
src/mserv.c 2 additions, 2 deletions

src/mserv.c
src/version.h 12 additions, 0 deletions

src/version.h

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