Merge branch 'next' into virtres
# Conflicts: # src/p_setup.c
No related branches found
No related tags found
Showing
- .travis.yml 37 additions, 17 deletions.travis.yml
- CMakeLists.txt 0 additions, 1 deletionCMakeLists.txt
- appveyor.yml 6 additions, 6 deletionsappveyor.yml
- assets/CMakeLists.txt 6 additions, 1 deletionassets/CMakeLists.txt
- debian-template/control 2 additions, 0 deletionsdebian-template/control
- deployer/travis/deployer_defaults.sh 8 additions, 8 deletionsdeployer/travis/deployer_defaults.sh
- extras/conf/SRB2-22.cfg 3 additions, 3 deletionsextras/conf/SRB2-22.cfg
- src/CMakeLists.txt 1 addition, 5 deletionssrc/CMakeLists.txt
- src/d_clisrv.c 3 additions, 3 deletionssrc/d_clisrv.c
- src/d_main.c 7 additions, 0 deletionssrc/d_main.c
- src/d_net.h 2 additions, 0 deletionssrc/d_net.h
- src/d_netcmd.c 5 additions, 1 deletionsrc/d_netcmd.c
- src/dehacked.c 76 additions, 2 deletionssrc/dehacked.c
- src/g_game.c 148 additions, 69 deletionssrc/g_game.c
- src/g_game.h 1 addition, 0 deletionssrc/g_game.h
- src/hardware/hw_cache.c 62 additions, 40 deletionssrc/hardware/hw_cache.c
- src/hardware/hw_data.h 1 addition, 0 deletionssrc/hardware/hw_data.h
- src/hardware/hw_defs.h 1 addition, 2 deletionssrc/hardware/hw_defs.h
- src/hardware/hw_drv.h 1 addition, 5 deletionssrc/hardware/hw_drv.h
- src/hardware/hw_glob.h 1 addition, 0 deletionssrc/hardware/hw_glob.h
Loading
Please register or sign in to comment