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	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
fmodex	DIE, DIE, DIE	2014-07-21 20:39:31 -04:00
gettext	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
gme	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
libpng-src	Starting from scratch. SRB2 v2.1.15	2016-07-06 00:10:19 -04:00
miniupnpc	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
SDL2	libs: include SDL2 and SDL2_mixer	2016-05-18 01:53:35 -04:00
SDL2_mixer	libs: include SDL2 and SDL2_mixer	2016-05-18 01:53:35 -04:00
win-iconv	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
zlib	Starting from scratch. SRB2 v2.1.15	2016-07-06 00:10:19 -04:00
.gitattributes	gitattributes: do not check whitespace for included libs	2016-05-18 10:38:29 -04:00
.gitignore	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
zlibVC6.diff	SRB2 2.1 release	2014-03-15 13:11:35 -04:00