Merge branch 'argrath' into NetHack-3.7

author nhmall <nhmall@nethack.org>

Wed, 9 Feb 2022 21:09:37 +0000 (16:09 -0500)

committer nhmall <nhmall@nethack.org>

Wed, 9 Feb 2022 21:09:37 +0000 (16:09 -0500)
author nhmall <nhmall@nethack.org>
Wed, 9 Feb 2022 21:09:37 +0000 (16:09 -0500)
committer nhmall <nhmall@nethack.org>
Wed, 9 Feb 2022 21:09:37 +0000 (16:09 -0500)
diff --cc src/eat.c
Simple merge
diff --cc src/save.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Wed, 9 Feb 2022 21:09:37 +0000 (16:09 -0500)
committer	nhmall <nhmall@nethack.org>
	Wed, 9 Feb 2022 21:09:37 +0000 (16:09 -0500)
		1	2
src/eat.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/save.c	patch \|	diff1 \|	diff2 \|	blob \| history