-
- Downloads
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
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- SRB2.cbp 537 additions, 3159 deletionsSRB2.cbp
- appveyor.yml 1 addition, 1 deletionappveyor.yml
- debian/docs 1 addition, 2 deletionsdebian/docs
- src/CMakeLists.txt 8 additions, 1 deletionsrc/CMakeLists.txt
- src/Makefile 19 additions, 1 deletionsrc/Makefile
- src/android/i_system.c 12 additions, 0 deletionssrc/android/i_system.c
- src/console.c 356 additions, 201 deletionssrc/console.c
- src/console.h 3 additions, 4 deletionssrc/console.h
- src/d_clisrv.c 1037 additions, 739 deletionssrc/d_clisrv.c
- src/d_clisrv.h 66 additions, 59 deletionssrc/d_clisrv.h
- src/d_main.c 36 additions, 0 deletionssrc/d_main.c
- src/d_net.c 309 additions, 113 deletionssrc/d_net.c
- src/d_net.h 11 additions, 9 deletionssrc/d_net.h
- src/d_netcmd.c 51 additions, 12 deletionssrc/d_netcmd.c
- src/d_netcmd.h 2 additions, 0 deletionssrc/d_netcmd.h
- src/d_netfil.c 333 additions, 160 deletionssrc/d_netfil.c
- src/d_netfil.h 10 additions, 13 deletionssrc/d_netfil.h
- src/djgppdos/i_system.c 12 additions, 0 deletionssrc/djgppdos/i_system.c
- src/doomdef.h 4 additions, 1 deletionsrc/doomdef.h
Loading
Please register or sign in to comment