Merge branch 'NetHack-3.6'

author nhmall <nhmall@nethack.org>

Wed, 27 Nov 2019 06:27:11 +0000 (01:27 -0500)

committer nhmall <nhmall@nethack.org>

Wed, 27 Nov 2019 06:27:11 +0000 (01:27 -0500)
author nhmall <nhmall@nethack.org>
Wed, 27 Nov 2019 06:27:11 +0000 (01:27 -0500)
committer nhmall <nhmall@nethack.org>
Wed, 27 Nov 2019 06:27:11 +0000 (01:27 -0500)
diff --cc include/mextra.h
Simple merge
diff --cc src/do.c
Simple merge
diff --cc src/makemon.c
Simple merge
diff --cc src/pager.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Wed, 27 Nov 2019 06:27:11 +0000 (01:27 -0500)
committer	nhmall <nhmall@nethack.org>
	Wed, 27 Nov 2019 06:27:11 +0000 (01:27 -0500)
		1	2
include/mextra.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/do.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/makemon.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/pager.c	patch \|	diff1 \|	diff2 \|	blob \| history