Sally Coolatta 63917ffccc The start of the scary 2.2 merge ... All conflicts are left in-tact. We should be collaborating on solving these files one at a time.		2020-05-29 13:43:38 -04:00
..
macosx	The start of the scary 2.2 merge	2020-05-29 13:43:38 -04:00
hwsym_sdl.c
i_main.c
i_system.c	K_PlayerForfeit on I_Quit	2019-10-02 11:47:56 -04:00
i_video.c	chaos conflict	2019-06-11 17:02:47 +02:00
sdl_sound.c	ferror does not return errno, are you stupid?	2020-03-24 15:48:42 -07:00
Srb2SDL-vc9.vcproj
Srb2SDL-vc10.vcxproj	chaos conflict	2019-06-11 17:02:47 +02:00
Srb2SDL.dsp
Srb2SDL.ico