Merge branch 'NetHack-3.7' into fix322

author Michael Meyer <me@entrez.cc>

Wed, 30 Dec 2020 19:05:16 +0000 (14:05 -0500)

committer Michael Meyer <me@entrez.cc>

Wed, 30 Dec 2020 19:05:16 +0000 (14:05 -0500)
author Michael Meyer <me@entrez.cc>
Wed, 30 Dec 2020 19:05:16 +0000 (14:05 -0500)
committer Michael Meyer <me@entrez.cc>
Wed, 30 Dec 2020 19:05:16 +0000 (14:05 -0500)
diff --cc include/extern.h
Simple merge
diff --cc src/bones.c
Simple merge
diff --cc src/do.c
Simple merge
diff --cc src/mon.c
Simple merge
author	Michael Meyer <me@entrez.cc>
	Wed, 30 Dec 2020 19:05:16 +0000 (14:05 -0500)
committer	Michael Meyer <me@entrez.cc>
	Wed, 30 Dec 2020 19:05:16 +0000 (14:05 -0500)
		1	2
include/extern.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/bones.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/do.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon.c	patch \|	diff1 \|	diff2 \|	blob \| history