toaster aa607ecf4c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again ... # Conflicts: # src/d_clisrv.c # src/m_misc.c		2018-11-18 18:26:50 +00:00
..
macosx
SDL_main
SRB2Pandora
CMakeLists.txt
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	Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)	2018-11-08 16:26:55 +00:00
i_main.c	Merge remote-tracking branch 'refs/remotes/srb2public/fof-slope-skew-backport'	2018-03-11 12:47:44 -04:00
i_net.c
i_system.c	Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge	2018-11-10 21:14:53 +00:00
i_ttf.c
i_ttf.h
i_video.c	Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge	2018-11-10 21:14:53 +00:00
IMG_xpm.c	Comment context for declaration changes; remove extern terms	2018-11-14 08:15:38 -05:00
MakeCYG.cfg
Makefile.cfg
MakeNIX.cfg
mixer_sound.c	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again	2018-11-18 18:26:50 +00:00
ogl_sdl.c	Fix wipes in low resolutions	2018-03-18 17:12:12 +00:00
ogl_sdl.h
SDL_icon.xpm	Smaller XPM with no redundant pixels	2018-09-20 22:36:01 +01:00
sdl_sound.c	Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge	2018-11-10 21:14:53 +00:00
sdlmain.h
srb2.ttf
Srb2SDL-vc9.vcproj
Srb2SDL-vc10.vcxproj	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again	2018-11-18 18:26:50 +00:00
Srb2SDL-vc10.vcxproj.filters	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again	2018-11-18 18:26:50 +00:00
Srb2SDL.dsp
Srb2SDL.dsw
Srb2SDL.ico	Update a bunch of icons - SDL_icon.xpm and other targets' .icos.	2018-09-18 19:37:03 +01:00
Srb2SDL.props