wolfy852 9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1 ... # Conflicts: # src/d_netcmd.c # src/r_main.c # src/v_video.c		2019-05-12 03:40:02 -05:00
..
macosx	Merge branch 'apng' into 'master'	2019-02-28 12:00:58 -08:00
SDL_main
SRB2Pandora
CMakeLists.txt	Merge branch 'apng' into 'master'	2019-02-28 12:00:58 -08:00
dosstr.c
endtxt.c
endtxt.h
hwsym_sdl.c	Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation	2019-01-07 04:33:22 -05:00
hwsym_sdl.h
i_cdmus.c
i_main.c
i_net.c
i_system.c	Move public demo vars to a single struct	2019-03-24 21:32:15 -05:00
i_ttf.c
i_ttf.h
i_video.c	Merge remote-tracking branch 'remotes/pub/master' into next	2019-05-06 14:17:02 -05:00
IMG_xpm.c
MakeCYG.cfg
Makefile.cfg
MakeNIX.cfg
mixer_sound.c	Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge	2019-05-07 21:43:12 -05: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 remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next	2019-05-06 22:40:12 -05:00
sdlmain.h	Reorganize some of the code for SDL_JOYDEVICEADDED events	2018-12-28 14:20:28 -06:00
srb2.ttf
srb2icon.png	Exported SDL_icon.xpm as srb2icon.png	2019-03-02 13:26:17 -05:00
Srb2SDL-vc9.vcproj	Merge branch 'apng' into 'master'	2019-02-28 12:00:58 -08:00
Srb2SDL-vc10.vcxproj	Merge branch 'next' into md3-vanilla-kart	2019-03-20 19:50:20 -05:00
Srb2SDL-vc10.vcxproj.filters	Merge branch 'next' into md3-vanilla-kart	2019-03-20 19:50:20 -05:00
Srb2SDL.dsp
Srb2SDL.dsw
Srb2SDL.ico	Updated Kart icons to higher res	2019-01-03 12:26:25 -05:00
Srb2SDL.props