TehRealSalt 8fe068ef46 Merge remote-tracking branch 'refs/remotes/srb2public/next' ... # Conflicts: # src/f_finale.c # src/hardware/hw_draw.c # src/hardware/hw_main.c # src/m_misc.c		2018-04-07 18:43:59 -04:00
..
filter
macosx	Change version number to 2.1.20	2017-11-08 15:06:42 +00:00
SDL_main
SRB2CE
SRB2DC
SRB2Pandora	Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders	2017-09-14 21:09:35 +01:00
SRB2PS3	Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders	2017-09-14 21:09:35 +01:00
SRB2PSP	Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders	2017-09-14 21:09:35 +01:00
SRB2WII	Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders	2017-09-14 21:09:35 +01:00
SRB2XBOX
dosstr.c
endtxt.c
endtxt.h
hwsym_sdl.c	Revert "Fix screenshot functionality in fullscreen in SDL2"	2018-03-18 18:33:53 +00:00
hwsym_sdl.h
i_cdmus.c
i_main.c	Some position code	2017-02-12 23:25:06 -05:00
i_net.c	Revert "Merge branch 'RemoveINetC' into 'master'"	2016-07-21 14:42:00 -04:00
i_system.c	More stuuuuff	2017-12-17 01:21:24 -05:00
i_ttf.c
i_ttf.h
i_video.c	Merge remote-tracking branch 'refs/remotes/srb2public/next'	2018-04-07 18:43:59 -04:00
IMG_xpm.c
MakeCYG.cfg	Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders	2017-09-14 21:09:35 +01:00
Makefile.cfg	Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders	2017-09-14 21:09:35 +01:00
MakeNIX.cfg	Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders	2017-09-14 21:09:35 +01:00
mixer_sound.c
ogl_sdl.c
ogl_sdl.h
SDL_icon.xpm
sdl_sound.c
sdlmain.h
srb2.ttf
Srb2SDL-vc9.vcproj
Srb2SDL-vc10.vcxproj
Srb2SDL.dsp
Srb2SDL.dsw
Srb2SDL.ico