Merge branch 'master' into next
Showing
- .circleci/config.yml 21 additions, 9 deletions.circleci/config.yml
- .gitignore 1 addition, 0 deletions.gitignore
- src/b_bot.c 5 additions, 5 deletionssrc/b_bot.c
- src/blua/liolib.c 0 additions, 1 deletionsrc/blua/liolib.c
- src/d_player.h 2 additions, 2 deletionssrc/d_player.h
- src/hardware/hw_main.c 1 addition, 1 deletionsrc/hardware/hw_main.c
- src/p_saveg.c 3 additions, 3 deletionssrc/p_saveg.c
- src/p_setup.c 1 addition, 1 deletionsrc/p_setup.c
- src/p_user.c 6 additions, 5 deletionssrc/p_user.c
- src/r_skins.c 1 addition, 1 deletionsrc/r_skins.c
- src/s_sound.c 4 additions, 4 deletionssrc/s_sound.c
- src/sdl/i_video.c 2 additions, 1 deletionsrc/sdl/i_video.c
- tools/masterserver/structure.sql 2 additions, 2 deletionstools/masterserver/structure.sql
Loading
Please register or sign in to comment