Monster Iestyn 70d1006800 Merge branch 'public_next' ... # Conflicts: # src/sdl12/Srb2SDL-vc10.vcxproj # src/sdl12/Srb2SDL-vc9.vcproj # src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj		2019-03-02 20:51:15 +00:00
..
macosx	Merge branch 'apng' into 'master'	2019-02-28 12:00:58 -08:00
SDL_main
SRB2Pandora
CMakeLists.txt	Merge branch 'apng' into 'master'	2019-02-28 12:00:58 -08:00
dosstr.c
endtxt.c
endtxt.h
hwsym_sdl.c
hwsym_sdl.h
i_cdmus.c
i_main.c
i_net.c
i_system.c	Merge branch 'public_next'	2019-03-02 20:51:15 +00:00
i_ttf.c
i_ttf.h
i_video.c	WIP 20190101 merge	2019-01-02 01:09:15 -05:00
IMG_xpm.c
MakeCYG.cfg
Makefile.cfg
MakeNIX.cfg
mixer_sound.c	Merge branch 'float_equal' into 'master'	2018-12-20 16:58:37 -05:00
ogl_sdl.c
ogl_sdl.h
SDL_icon.xpm	Update XPM icon	2018-12-29 22:52:04 -05:00
sdl_sound.c	WIP 20190101 merge	2019-01-02 01:09:15 -05:00
sdlmain.h
srb2.ttf
srb2icon.png	Inclue PNG file	2018-12-29 23:10:45 -05:00
Srb2SDL-vc9.vcproj	Merge branch 'apng' into 'master'	2019-02-28 12:00:58 -08:00
Srb2SDL-vc10.vcxproj	Merge branch 'apng' into 'master'	2019-02-28 12:00:58 -08:00
Srb2SDL-vc10.vcxproj.filters	Merge branch 'public_next'	2019-03-02 20:51:15 +00:00
Srb2SDL.dsp
Srb2SDL.dsw
Srb2SDL.ico
Srb2SDL.props