Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Andrea Odetti 2020-11-28 10:02:11 +00:00
commit 312a618196

View file

@ -100,7 +100,7 @@ static bool g_bVideoScannerNTSC = true; // NTSC video scanning (or PAL)
// NOTE: KEEP IN SYNC: VideoType_e g_aVideoChoices g_apVideoModeDesc // NOTE: KEEP IN SYNC: VideoType_e g_aVideoChoices g_apVideoModeDesc
// The window title will be set to this. // The window title will be set to this.
const char *g_apVideoModeDesc[ NUM_VIDEO_MODES ] = static const char *g_apVideoModeDesc[ NUM_VIDEO_MODES ] =
{ {
"Monochrome (Custom)" "Monochrome (Custom)"
, "Color (Composite Idealized)" , "Color (Composite Idealized)"