Merge branch 'master' into v2.1

author Mike Pall <mike>

Sat, 24 Aug 2024 15:14:51 +0000 (17:14 +0200)

committer Mike Pall <mike>

Sat, 24 Aug 2024 15:14:51 +0000 (17:14 +0200)
author Mike Pall <mike>
Sat, 24 Aug 2024 15:14:51 +0000 (17:14 +0200)
committer Mike Pall <mike>
Sat, 24 Aug 2024 15:14:51 +0000 (17:14 +0200)
diff --cc src/lj_ffrecord.c
Simple merge
diff --cc src/lj_opt_narrow.c
Simple merge
		1	2
src/lj_ffrecord.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_opt_narrow.c	patch \|	diff1 \|	diff2 \|	blob \| history