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
..
bcd.c
bcd.h
i_cdmus.c
i_main.c
i_net.c
i_sound.c	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""	2019-08-04 12:03:57 +01:00
i_system.c	The start of the scary 2.2 merge	2020-05-29 13:43:38 -04:00
i_video.c	Rename stuff around	2020-02-17 21:11:56 -03:00
internal.h	Kill trailing whitespace	2020-03-21 17:37:33 -07:00
Makefile.cfg
rdb-s.h	Update copyright year to 2020	2020-02-19 14:08:45 -08:00
vid_vesa.c	The start of the scary 2.2 merge	2020-05-29 13:43:38 -04:00
vid_vesa.h