Monster Iestyn 67392baae0 Merge branch 'public_next' ... # Conflicts: # src/doomdef.h # src/hardware/hw_draw.c # src/m_misc.c # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj		2019-06-09 20:04:08 +01:00
..
macosx	Update version to 2.1.24	2019-06-07 15:48:33 +01:00
SDL_main
SRB2Pandora
CMakeLists.txt	Merge branch 'master' into travis-deployer	2019-06-07 16:56:19 -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'	2019-03-28 14:19:02 +00:00
i_ttf.c
i_ttf.h
i_video.c	Merge branch 'public_next'	2019-05-16 15:58:17 +01:00
IMG_xpm.c
MakeCYG.cfg
Makefile.cfg
MakeNIX.cfg
mixer_sound.c	Remove song_length tag search	2019-05-02 19:14:23 -04:00
ogl_sdl.c
ogl_sdl.h
SDL_icon.xpm	Update XPM icon	2018-12-29 22:52:04 -05:00
sdl_sound.c	Merge branch 'public_next'	2019-03-14 22:15:34 -04: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 'gme-msvc' into 'master'	2019-06-07 18:06:51 -04: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	Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC	2019-01-04 21:18:55 -05:00