Merge branch 'NetHack-3.6'

author nhmall <nhmall@nethack.org>

Mon, 18 Nov 2019 20:15:37 +0000 (15:15 -0500)

committer nhmall <nhmall@nethack.org>

Mon, 18 Nov 2019 20:15:37 +0000 (15:15 -0500)
author nhmall <nhmall@nethack.org>
Mon, 18 Nov 2019 20:15:37 +0000 (15:15 -0500)
committer nhmall <nhmall@nethack.org>
Mon, 18 Nov 2019 20:15:37 +0000 (15:15 -0500)
diff --cc src/files.c
Simple merge
diff --cc src/objnam.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Mon, 18 Nov 2019 20:15:37 +0000 (15:15 -0500)
committer	nhmall <nhmall@nethack.org>
	Mon, 18 Nov 2019 20:15:37 +0000 (15:15 -0500)
		1	2
src/files.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/objnam.c	patch \|	diff1 \|	diff2 \|	blob \| history