Merge branch 'NetHack-3.7' into paxed-lua-v2-merged

author nhmall <nhmall@nethack.org>

Fri, 15 Nov 2019 00:50:20 +0000 (19:50 -0500)

committer nhmall <nhmall@nethack.org>

Fri, 15 Nov 2019 00:50:20 +0000 (19:50 -0500)
author nhmall <nhmall@nethack.org>
Fri, 15 Nov 2019 00:50:20 +0000 (19:50 -0500)
committer nhmall <nhmall@nethack.org>
Fri, 15 Nov 2019 00:50:20 +0000 (19:50 -0500)
diff --cc include/extern.h
Simple merge
diff --cc src/files.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Fri, 15 Nov 2019 00:50:20 +0000 (19:50 -0500)
committer	nhmall <nhmall@nethack.org>
	Fri, 15 Nov 2019 00:50:20 +0000 (19:50 -0500)
		1	2
include/extern.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/files.c	patch \|	diff1 \|	diff2 \|	blob \| history