Monster Iestyn 0b6a463cff Merge branch 'public_next' ... # Conflicts: # src/config.h.in # src/d_clisrv.c # src/d_netcmd.c # src/doomdef.h # src/p_map.c # src/p_maputl.c # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj		2019-08-20 13:54:48 +01:00
..
macosx	Update version to 2.1.25	2019-08-16 20:14:01 +01:00
SDL_main
SRB2Pandora
CMakeLists.txt	Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt	2019-06-11 17:48:00 -04: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' into private	2019-08-08 23:41:19 -04:00
i_ttf.c
i_ttf.h
i_video.c	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""	2019-08-04 12:03:57 +01:00
IMG_xpm.c
MakeCYG.cfg
Makefile.cfg	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""	2019-08-04 12:03:57 +01:00
MakeNIX.cfg
mixer_sound.c	Use strtok instead of strtok_r	2019-08-07 01:29:05 -04:00
ogl_sdl.c
ogl_sdl.h
SDL_icon.xpm
sdl_sound.c	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""	2019-08-04 12:03:57 +01:00
sdlmain.h
srb2.ttf
srb2icon.png
Srb2SDL-vc9.vcproj
Srb2SDL-vc10.vcxproj	Fix building with MSVC	2019-07-29 19:02:45 -04:00
Srb2SDL-vc10.vcxproj.filters	Fix building with MSVC	2019-07-29 19:02:45 -04:00
Srb2SDL.dsp
Srb2SDL.dsw
Srb2SDL.ico
Srb2SDL.props	Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt	2019-06-11 17:48:00 -04:00