wolfy852 5c5e6a26dd Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks ... # Conflicts: # CMakeLists.txt # appveyor.yml # src/command.c # src/command.h # src/d_clisrv.c # src/d_netcmd.c # src/dehacked.c # src/doomdef.h # src/hu_stuff.c # src/m_misc.c		2019-01-08 16:32:24 -06:00
..
macosx	Update code versions to 2.1.23	2018-12-26 16:31:43 -05:00
SDL_main
SRB2Pandora
CMakeLists.txt	Update CMake paths for Windows DLLs	2018-12-20 16:46:40 -05: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	Check joystick IDs against all other players [by Digiku]	2018-12-29 02:33:53 -06:00
i_ttf.c
i_ttf.h
i_video.c	Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks	2019-01-08 16:32:24 -06: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 srb2 next	2019-01-05 15:59:23 -05:00
ogl_sdl.c
ogl_sdl.h
SDL_icon.xpm
sdl_sound.c	merge srb2 next	2019-01-05 15:59:23 -05:00
sdlmain.h	Reorganize some of the code for SDL_JOYDEVICEADDED events	2018-12-28 14:20:28 -06:00
srb2.ttf
Srb2SDL-vc9.vcproj
Srb2SDL-vc10.vcxproj	merge srb2 next	2019-01-05 15:59:23 -05:00
Srb2SDL-vc10.vcxproj.filters	Merge remote-tracking branch 'srb2public/next' into merge-next	2018-12-03 00:31:23 -05:00
Srb2SDL.dsp
Srb2SDL.dsw
Srb2SDL.ico
Srb2SDL.props