wolfy852 9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1 ... # Conflicts: # src/d_netcmd.c # src/r_main.c # src/v_video.c		2019-05-12 03:40:02 -05:00
..
afxres.h
CMakeLists.txt
dx_error.c
dx_error.h
fabdxlib.c
fabdxlib.h
Makefile.cfg	Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next	2019-05-06 22:40:12 -05:00
resource.h
Srb2win-vc9.vcproj
Srb2win-vc10.vcxproj
Srb2win-vc10.vcxproj.filters
Srb2win.dsp
Srb2win.dsw	SRB2 2.1 release	2014-03-15 13:11:35 -04:00
Srb2win.ico
Srb2win.props
Srb2win.rc
win_cd.c
win_dbg.c	Merge branch 'upstream/next' into zarrotsu_vanillamerge	2017-02-17 20:14:55 +00:00
win_dbg.h
win_dll.c
win_dll.h
win_main.c
win_main.h
win_net.c
win_snd.c
win_sys.c
win_vid.c