Merge branch 'master' into next
Showing
- appveyor.yml 40 additions, 5 deletionsappveyor.yml
- src/hardware/r_opengl/r_opengl.h 1 addition, 1 deletionsrc/hardware/r_opengl/r_opengl.h
- src/hardware/s_openal/s_openal-vc10.vcxproj 2 additions, 1 deletionsrc/hardware/s_openal/s_openal-vc10.vcxproj
- src/sdl/SDL2_x64.props 2 additions, 1 deletionsrc/sdl/SDL2_x64.props
- src/sdl/SDL2_x86.props 1 addition, 1 deletionsrc/sdl/SDL2_x86.props
- src/sdl/SDL_main/SDL_win32_main.c 0 additions, 406 deletionssrc/sdl/SDL_main/SDL_win32_main.c
- src/sdl/SDL_main/SDL_windows_main.c 200 additions, 0 deletionssrc/sdl/SDL_main/SDL_windows_main.c
- src/sdl/Srb2SDL-vc10.vcxproj 5 additions, 12 deletionssrc/sdl/Srb2SDL-vc10.vcxproj
- src/win32/Srb2win-vc10.vcxproj 8 additions, 4 deletionssrc/win32/Srb2win-vc10.vcxproj
- src/win32/win_main.h 1 addition, 1 deletionsrc/win32/win_main.h
Loading
Please register or sign in to comment