Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat
Showing
- .circleci/config.yml 2 additions, 2 deletions.circleci/config.yml
- src/Makefile 54 additions, 24 deletionssrc/Makefile
- src/Makefile.cfg 4 additions, 5 deletionssrc/Makefile.cfg
- src/d_clisrv.c 14 additions, 6 deletionssrc/d_clisrv.c
- src/d_main.c 2 additions, 0 deletionssrc/d_main.c
- src/doomdef.h 6 additions, 6 deletionssrc/doomdef.h
- src/http-mserv.c 8 additions, 0 deletionssrc/http-mserv.c
- src/m_menu.c 18 additions, 9 deletionssrc/m_menu.c
- src/mserv.c 44 additions, 23 deletionssrc/mserv.c
- src/sdl/Makefile.cfg 0 additions, 22 deletionssrc/sdl/Makefile.cfg
- src/sdl/i_video.c 1 addition, 0 deletionssrc/sdl/i_video.c
- src/sdl/mixer_sound.c 2 additions, 0 deletionssrc/sdl/mixer_sound.c
Loading
Please register or sign in to comment