Merge branch 'NetHack-3.6'

author nhmall <nhmall@nethack.org>

Wed, 22 May 2019 04:48:39 +0000 (00:48 -0400)

committer nhmall <nhmall@nethack.org>

Wed, 22 May 2019 04:48:39 +0000 (00:48 -0400)
author nhmall <nhmall@nethack.org>
Wed, 22 May 2019 04:48:39 +0000 (00:48 -0400)
committer nhmall <nhmall@nethack.org>
Wed, 22 May 2019 04:48:39 +0000 (00:48 -0400)
diff --cc include/extern.h
Simple merge
diff --cc src/ball.c
Simple merge
diff --cc src/objnam.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Wed, 22 May 2019 04:48:39 +0000 (00:48 -0400)
committer	nhmall <nhmall@nethack.org>
	Wed, 22 May 2019 04:48:39 +0000 (00:48 -0400)
		1	2
include/extern.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/ball.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/objnam.c	patch \|	diff1 \|	diff2 \|	blob \| history