Merge branch 'master' into v2.1

author Mike Pall <mike>

Fri, 2 Jun 2023 09:42:24 +0000 (11:42 +0200)

committer Mike Pall <mike>

Fri, 2 Jun 2023 09:42:24 +0000 (11:42 +0200)
author Mike Pall <mike>
Fri, 2 Jun 2023 09:42:24 +0000 (11:42 +0200)
committer Mike Pall <mike>
Fri, 2 Jun 2023 09:42:24 +0000 (11:42 +0200)
diff --cc src/host/buildvm_lib.c
Simple merge
diff --cc src/lj_opt_mem.c
Simple merge
		1	2
src/host/buildvm_lib.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_opt_mem.c	patch \|	diff1 \|	diff2 \|	blob \| history