Merge branch 'next' into 'better-download'
# Conflicts: # src/sdl/i_system.c # src/win32/win_sys.c
No related branches found
No related tags found
Showing
- extras/conf/SRB2-22.cfg 25 additions, 13 deletionsextras/conf/SRB2-22.cfg
- src/am_map.c 2 additions, 5 deletionssrc/am_map.c
- src/d_clisrv.c 29 additions, 24 deletionssrc/d_clisrv.c
- src/d_clisrv.h 6 additions, 5 deletionssrc/d_clisrv.h
- src/d_main.c 9 additions, 0 deletionssrc/d_main.c
- src/d_net.c 4 additions, 3 deletionssrc/d_net.c
- src/d_netcmd.c 68 additions, 45 deletionssrc/d_netcmd.c
- src/d_player.h 3 additions, 2 deletionssrc/d_player.h
- src/dehacked.c 168 additions, 28 deletionssrc/dehacked.c
- src/djgppdos/i_system.c 4 additions, 0 deletionssrc/djgppdos/i_system.c
- src/doomdata.h 0 additions, 4 deletionssrc/doomdata.h
- src/doomdef.h 28 additions, 12 deletionssrc/doomdef.h
- src/doomstat.h 15 additions, 2 deletionssrc/doomstat.h
- src/f_finale.c 1 addition, 1 deletionsrc/f_finale.c
- src/f_finale.h 2 additions, 0 deletionssrc/f_finale.h
- src/f_wipe.c 8 additions, 0 deletionssrc/f_wipe.c
- src/g_demo.c 143 additions, 122 deletionssrc/g_demo.c
- src/g_game.c 10 additions, 8 deletionssrc/g_game.c
- src/g_state.h 2 additions, 1 deletionsrc/g_state.h
- src/hardware/hw_main.c 63 additions, 112 deletionssrc/hardware/hw_main.c
Loading
Please register or sign in to comment