Merge branch 'public_next' into master

.gitignore

SRB2_Debug.props

SRB2_Release.props

SRB2_common.props

comptime.props

libs/FMOD.props

libs/SDL2.props

libs/SDL_mixer.props

libs/libpng-src/projects/visualc10/libpng.vcxproj

libs/libpng.props

libs/zlib.props

libs/zlib/projects/visualc10/zlib.vcxproj

src/hardware/hw_main.c

src/hardware/r_opengl/r_opengl-vc10.vcxproj

src/hardware/r_opengl/r_opengl.h

src/hardware/s_openal/s_openal-vc10.vcxproj

src/i_addrinfo.c

src/p_mobj.c

src/p_setup.c

src/p_slopes.c