Merge remote-tracking branch 'origin/master' into http-mserv
Showing
- .travis.yml 17 additions, 17 deletions.travis.yml
- src/command.c 2 additions, 3 deletionssrc/command.c
- src/d_clisrv.c 1 addition, 0 deletionssrc/d_clisrv.c
- src/d_main.c 3 additions, 30 deletionssrc/d_main.c
- src/d_netfil.c 2 additions, 2 deletionssrc/d_netfil.c
- src/doomdef.h 1 addition, 1 deletionsrc/doomdef.h
- src/hardware/hw_main.c 2 additions, 2 deletionssrc/hardware/hw_main.c
- src/hardware/r_opengl/r_opengl.c 13 additions, 13 deletionssrc/hardware/r_opengl/r_opengl.c
- src/k_kart.c 1 addition, 1 deletionsrc/k_kart.c
- src/k_kart.h 1 addition, 1 deletionsrc/k_kart.h
- src/m_argv.c 2 additions, 1 deletionsrc/m_argv.c
- src/m_misc.c 12 additions, 0 deletionssrc/m_misc.c
- src/m_misc.h 2 additions, 0 deletionssrc/m_misc.h
- src/p_setup.c 16 additions, 20 deletionssrc/p_setup.c
- src/r_main.c 1 addition, 1 deletionsrc/r_main.c
- src/r_plane.c 1 addition, 1 deletionsrc/r_plane.c
- src/s_sound.h 1 addition, 1 deletionsrc/s_sound.h
- src/sdl/ogl_sdl.c 16 additions, 0 deletionssrc/sdl/ogl_sdl.c
- src/sdl/sdl_sound.c 4 additions, 1 deletionsrc/sdl/sdl_sound.c
- src/sdl12/sdl_sound.c 1 addition, 1 deletionsrc/sdl12/sdl_sound.c
Loading
Please register or sign in to comment