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

ee72312d

Commit ee72312d authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into makefile-revision-final

parents ec8b63d6 8b021ec1

Loading

Changes 166

Expand all Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 1 addition, 1 deletion

appveyor.yml
extras/conf/SRB2-22.cfg 104 additions, 42 deletions

extras/conf/SRB2-22.cfg
src/Makefile.d/features.mk 0 additions, 1 deletion

src/Makefile.d/features.mk
src/Sourcefile 9 additions, 0 deletions

src/Sourcefile
src/android/i_cdmus.c 2 additions, 2 deletions

src/android/i_cdmus.c
src/android/i_video.c 11 additions, 3 deletions

src/android/i_video.c
src/blua/lcode.c 12 additions, 19 deletions

src/blua/lcode.c
src/blua/liolib.c 5 additions, 1 deletion

src/blua/liolib.c
src/command.c 149 additions, 12 deletions

src/command.c
src/command.h 19 additions, 0 deletions

src/command.h
src/config.h.in 3 additions, 2 deletions

src/config.h.in
src/console.c 122 additions, 81 deletions

src/console.c
src/console.h 4 additions, 0 deletions

src/console.h
src/d_clisrv.c 289 additions, 894 deletions

src/d_clisrv.c
src/d_clisrv.h 5 additions, 178 deletions

src/d_clisrv.h
src/d_main.c 33 additions, 164 deletions

src/d_main.c
src/d_net.c 3 additions, 3 deletions

src/d_net.c
src/d_netcmd.c 212 additions, 182 deletions

src/d_netcmd.c
src/d_netcmd.h 4 additions, 5 deletions

src/d_netcmd.h
src/d_netfil.c 26 additions, 7 deletions

src/d_netfil.c

with 1013 additions and 1597 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