Merge remote-tracking branch 'origin/master' into next
Showing
- .travis.yml 37 additions, 17 deletions.travis.yml
- 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
- src/d_clisrv.c 1 addition, 1 deletionsrc/d_clisrv.c
- src/d_net.h 2 additions, 0 deletionssrc/d_net.h
- src/d_netcmd.c 4 additions, 0 deletionssrc/d_netcmd.c
- src/g_game.c 148 additions, 69 deletionssrc/g_game.c
- src/g_game.h 1 addition, 0 deletionssrc/g_game.h
- src/i_tcp.c 23 additions, 12 deletionssrc/i_tcp.c
- src/m_menu.c 5 additions, 1 deletionsrc/m_menu.c
- src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletionssrc/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
Loading
Please register or sign in to comment