Merge branch 'master' (1.5) into futurepk3
Showing
- assets/CMakeLists.txt 0 additions, 1 deletionassets/CMakeLists.txt
- src/config.h.in 3 additions, 2 deletionssrc/config.h.in
- src/d_main.c 5 additions, 1 deletionsrc/d_main.c
- src/doomdef.h 3 additions, 3 deletionssrc/doomdef.h
- src/http-mserv.c 15 additions, 1 deletionsrc/http-mserv.c
- src/hu_stuff.c 7 additions, 3 deletionssrc/hu_stuff.c
- src/i_tcp.c 2 additions, 2 deletionssrc/i_tcp.c
- src/mserv.c 5 additions, 2 deletionssrc/mserv.c
- src/p_local.h 1 addition, 0 deletionssrc/p_local.h
- src/p_user.c 1 addition, 0 deletionssrc/p_user.c
- src/r_main.c 29 additions, 9 deletionssrc/r_main.c
- src/sdl/CMakeLists.txt 2 additions, 0 deletionssrc/sdl/CMakeLists.txt
- src/v_video.c 3 additions, 1 deletionsrc/v_video.c
- src/v_video.h 1 addition, 1 deletionsrc/v_video.h
Loading
Please register or sign in to comment