Steel Titanium 06f76f07f4 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport ... # Conflicts: # src/hardware/r_opengl/r_opengl.c		2020-06-17 18:15:07 -04:00
..
afxres.h
CMakeLists.txt
dx_error.c
dx_error.h
fabdxlib.c
fabdxlib.h
Makefile.cfg
resource.h
Srb2win-vc9.vcproj	Use HAVE_BLUA as fuel for my fireplace	2020-03-19 18:36:14 +01:00
Srb2win-vc10.vcxproj
Srb2win-vc10.vcxproj.filters
Srb2win.dsp
Srb2win.dsw
Srb2win.ico
Srb2win.props
Srb2win.rc
win_cd.c
win_dbg.c
win_dbg.h
win_dll.c
win_dll.h
win_main.c	clean up BUGTRAP code in win32/win_main.c to avoid unmatched }	2020-06-03 20:47:49 +01:00
win_main.h
win_net.c
win_snd.c
win_sys.c	Merge branch 'next' into 'better-download'	2020-06-01 08:16:53 -04:00
win_vid.c	fix build errors in public master	2020-05-06 18:35:54 -04:00