Merge branch 'DarkPlacesEngine:master' into switch

author Lockl00p <97256723+Lockl00p@users.noreply.github.com>

Mon, 3 Jun 2024 18:16:28 +0000 (11:16 -0700)

committer GitHub <noreply@github.com>

Mon, 3 Jun 2024 18:16:28 +0000 (11:16 -0700)
author Lockl00p <97256723+Lockl00p@users.noreply.github.com>
Mon, 3 Jun 2024 18:16:28 +0000 (11:16 -0700)
committer GitHub <noreply@github.com>
Mon, 3 Jun 2024 18:16:28 +0000 (11:16 -0700)
diff --cc console.c
Simple merge
diff --cc vid_sdl.c
Simple merge
diff --cc vid_shared.c
Simple merge
author	Lockl00p <97256723+Lockl00p@users.noreply.github.com>
	Mon, 3 Jun 2024 18:16:28 +0000 (11:16 -0700)
committer	GitHub <noreply@github.com>
	Mon, 3 Jun 2024 18:16:28 +0000 (11:16 -0700)
		1	2
console.c	patch \|	diff1 \|	diff2 \|	blob \| history
vid_sdl.c	patch \|	diff1 \|	diff2 \|	blob \| history
vid_shared.c	patch \|	diff1 \|	diff2 \|	blob \| history