Inuyasha 8b7e0347fd Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next ... # Conflicts: # src/sdl/i_system.c		2016-02-25 15:41:13 -08:00
..
macosx	cmake: on mac, check Resources in bundle first.	2015-01-28 23:38:40 -06:00
SDL_main
SRB2Pandora
CMakeLists.txt	whitespace clean	2016-02-25 18:31:40 -05:00
dosstr.c
endtxt.c
endtxt.h
hwsym_sdl.c	Virtual resolutions in OpenGL	2014-11-13 18:06:38 -06:00
hwsym_sdl.h
i_cdmus.c
i_main.c	build: cmake is messly	2016-02-07 20:53:27 -05:00
i_net.c
i_system.c	whitespace clean	2016-02-25 18:31:40 -05:00
i_ttf.c
i_ttf.h
i_video.c	I guess this is becoming the "try to make SDL_mixer work" branch	2016-02-22 23:08:35 -08:00
IMG_xpm.c
MakeCYG.cfg
Makefile.cfg	build: cmake is messly	2016-02-07 20:53:27 -05:00
MakeNIX.cfg
mixer_sound.c	I guess this is becoming the "try to make SDL_mixer work" branch	2016-02-22 23:08:35 -08:00
ogl_sdl.c	Virtual resolutions in OpenGL	2014-11-13 18:06:38 -06:00
ogl_sdl.h	Virtual resolutions in OpenGL	2014-11-13 18:06:38 -06:00
SDL_icon.xpm	New HD SRB2 icon by VAdaPEga.	2015-03-01 20:07:56 -05:00
sdl_sound.c	I guess this is becoming the "try to make SDL_mixer work" branch	2016-02-22 23:08:35 -08:00
sdlmain.h	cmake: Fixes to allow MSVC to compile	2015-01-28 02:09:03 -06:00
srb2.ttf
Srb2SDL-vc9.vcproj
Srb2SDL-vc10.vcxproj
Srb2SDL.dsp
Srb2SDL.dsw
Srb2SDL.ico	New HD SRB2 icon by VAdaPEga.	2015-03-01 20:07:56 -05:00