Merge branch 'master' into v2.1

author Mike Pall <mike>

Mon, 13 Jan 2025 15:22:22 +0000 (16:22 +0100)

committer Mike Pall <mike>

Mon, 13 Jan 2025 15:22:22 +0000 (16:22 +0100)
author Mike Pall <mike>
Mon, 13 Jan 2025 15:22:22 +0000 (16:22 +0100)
committer Mike Pall <mike>
Mon, 13 Jan 2025 15:22:22 +0000 (16:22 +0100)
diff --cc src/lib_base.c
Simple merge
diff --cc src/lj_record.c
Simple merge
		1	2
src/lib_base.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_record.c	patch \|	diff1 \|	diff2 \|	blob \| history