Merge branch 'master' into next
Showing
- src/d_netcmd.h 1 addition, 1 deletionsrc/d_netcmd.h
- src/hardware/hw_main.c 1 addition, 1 deletionsrc/hardware/hw_main.c
- src/i_sound.h 1 addition, 1 deletionsrc/i_sound.h
- src/m_misc.c 21 additions, 6 deletionssrc/m_misc.c
- src/sdl/Srb2SDL-vc10.vcxproj 2 additions, 0 deletionssrc/sdl/Srb2SDL-vc10.vcxproj
- src/sdl/Srb2SDL-vc10.vcxproj.filters 6 additions, 0 deletionssrc/sdl/Srb2SDL-vc10.vcxproj.filters
- src/sdl/mixer_sound.c 2 additions, 2 deletionssrc/sdl/mixer_sound.c
- src/win32/Srb2win-vc10.vcxproj 2 additions, 0 deletionssrc/win32/Srb2win-vc10.vcxproj
- src/win32/Srb2win-vc10.vcxproj.filters 6 additions, 0 deletionssrc/win32/Srb2win-vc10.vcxproj.filters
- src/win32/win_dll.c 1 addition, 1 deletionsrc/win32/win_dll.c
- src/win32/win_snd.c 11 additions, 5 deletionssrc/win32/win_snd.c
Loading
Please register or sign in to comment