Sryder 2d6c7959ed Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge ... # Conflicts: # .gitignore # libs/zlib/projects/visualc10/zlib.vcxproj # src/Makefile # src/am_map.c # src/d_main.c # src/dehacked.c # src/doomdef.h # src/g_game.c # src/hardware/hw_main.c # src/hardware/hw_md2.c # src/info.c # src/p_inter.c # src/p_map.c # src/p_mobj.c # src/p_spec.c # src/p_user.c # src/r_bsp.c # src/r_plane.c # src/r_segs.c # src/r_things.c # src/s_sound.c # src/s_sound.h # src/sdl/Srb2SDL-vc10.vcxproj # src/win32/Srb2win-vc10.vcxproj # src/win32/Srb2win.ico # src/y_inter.c		2017-02-17 20:03:10 +00:00
..
curl
fmodex
gettext
gme
libpng-src
miniupnpc
SDL2
SDL2_mixer
win-iconv
zlib
.gitattributes
.gitignore
FMOD.props
libpng.props
SDL2.props
SDL_mixer.props
zlib.props
zlibVC6.diff