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

6e33a633

Commit 6e33a633 authored 8 years ago by wolfs

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/pub/next' into next

# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/doomdef.h
#	src/p_user.c

parents 1902114a a29ced72

Branches

Tags SRB2_release_2.1.14

Loading

Changes 79

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
SRB2.cbp 537 additions, 3159 deletions

SRB2.cbp
appveyor.yml 1 addition, 1 deletion

appveyor.yml
debian/docs 1 addition, 2 deletions

debian/docs
src/CMakeLists.txt 8 additions, 1 deletion

src/CMakeLists.txt
src/Makefile 19 additions, 1 deletion

src/Makefile
src/android/i_system.c 12 additions, 0 deletions

src/android/i_system.c
src/console.c 356 additions, 201 deletions

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

src/console.h
src/d_clisrv.c 1037 additions, 739 deletions

src/d_clisrv.c
src/d_clisrv.h 66 additions, 59 deletions

src/d_clisrv.h
src/d_main.c 36 additions, 0 deletions

src/d_main.c
src/d_net.c 309 additions, 113 deletions

src/d_net.c
src/d_net.h 11 additions, 9 deletions

src/d_net.h
src/d_netcmd.c 51 additions, 12 deletions

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

src/d_netcmd.h
src/d_netfil.c 333 additions, 160 deletions

src/d_netfil.c
src/d_netfil.h 10 additions, 13 deletions

src/d_netfil.h
src/djgppdos/i_system.c 12 additions, 0 deletions

src/djgppdos/i_system.c
src/doomdef.h 4 additions, 1 deletion

src/doomdef.h

with 2809 additions and 4476 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