Merge 'NetHack-3.6' updates into NetHack-3.7-Jan2020

author nhmall <nhmall@nethack.org>

Sun, 26 Jan 2020 04:45:38 +0000 (23:45 -0500)

committer nhmall <nhmall@nethack.org>

Sun, 26 Jan 2020 04:45:38 +0000 (23:45 -0500)
author nhmall <nhmall@nethack.org>
Sun, 26 Jan 2020 04:45:38 +0000 (23:45 -0500)
committer nhmall <nhmall@nethack.org>
Sun, 26 Jan 2020 04:45:38 +0000 (23:45 -0500)
diff --cc doc/Guidebook.mn
Simple merge
diff --cc doc/Guidebook.tex
Simple merge
diff --cc include/patchlevel.h
Simple merge
author	nhmall <nhmall@nethack.org>
	Sun, 26 Jan 2020 04:45:38 +0000 (23:45 -0500)
committer	nhmall <nhmall@nethack.org>
	Sun, 26 Jan 2020 04:45:38 +0000 (23:45 -0500)
		1	2
doc/Guidebook.mn	patch \|	diff1 \|	diff2 \|	blob \| history
doc/Guidebook.tex	patch \|	diff1 \|	diff2 \|	blob \| history
include/patchlevel.h	patch \|	diff1 \|	diff2 \|	blob \| history