Merge branch 'options-overhaul' into NetHack-3.7

author nhmall <nhmall@nethack.org>

Wed, 26 Feb 2020 19:36:20 +0000 (14:36 -0500)

committer nhmall <nhmall@nethack.org>

Wed, 26 Feb 2020 19:36:20 +0000 (14:36 -0500)
author nhmall <nhmall@nethack.org>
Wed, 26 Feb 2020 19:36:20 +0000 (14:36 -0500)
committer nhmall <nhmall@nethack.org>
Wed, 26 Feb 2020 19:36:20 +0000 (14:36 -0500)
diff --cc doc/fixes37.0
Simple merge
diff --cc include/extern.h
Simple merge
author	nhmall <nhmall@nethack.org>
	Wed, 26 Feb 2020 19:36:20 +0000 (14:36 -0500)
committer	nhmall <nhmall@nethack.org>
	Wed, 26 Feb 2020 19:36:20 +0000 (14:36 -0500)
		1	2
doc/fixes37.0	patch \|	diff1 \|	diff2 \|	blob \| history
include/extern.h	patch \|	diff1 \|	diff2 \|	blob \| history