Merge branch 'public_next'
# Conflicts: # src/doomdef.h # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj # src/win32/win_vid.c
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- SRB2_Debug.props 1 addition, 1 deletionSRB2_Debug.props
- appveyor.yml 1 addition, 1 deletionappveyor.yml
- src/d_clisrv.c 66 additions, 14 deletionssrc/d_clisrv.c
- src/d_netcmd.c 56 additions, 0 deletionssrc/d_netcmd.c
- src/doomdef.h 2 additions, 2 deletionssrc/doomdef.h
- src/hardware/r_opengl/r_opengl-vc10.vcxproj 4 additions, 0 deletionssrc/hardware/r_opengl/r_opengl-vc10.vcxproj
- src/hardware/s_openal/s_openal-vc10.vcxproj 4 additions, 0 deletionssrc/hardware/s_openal/s_openal-vc10.vcxproj
- src/i_tcp.c 10 additions, 14 deletionssrc/i_tcp.c
- src/lua_hooklib.c 14 additions, 0 deletionssrc/lua_hooklib.c
- src/lua_script.c 8 additions, 1 deletionsrc/lua_script.c
- src/mserv.c 31 additions, 33 deletionssrc/mserv.c
- src/p_mobj.c 10 additions, 0 deletionssrc/p_mobj.c
- src/p_spec.c 2 additions, 4 deletionssrc/p_spec.c
- src/sdl/i_main.c 2 additions, 0 deletionssrc/sdl/i_main.c
- src/sdl/i_video.c 1 addition, 1 deletionsrc/sdl/i_video.c
- src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletionssrc/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
- src/win32/Makefile.cfg 3 additions, 2 deletionssrc/win32/Makefile.cfg
- src/win32/win_main.c 4 additions, 2 deletionssrc/win32/win_main.c
Loading
Please register or sign in to comment