Merge branch 'NetHack-3.6'

author nhmall <nhmall@nethack.org>

Mon, 17 Jun 2019 19:24:53 +0000 (15:24 -0400)

committer nhmall <nhmall@nethack.org>

Mon, 17 Jun 2019 19:24:53 +0000 (15:24 -0400)
author nhmall <nhmall@nethack.org>
Mon, 17 Jun 2019 19:24:53 +0000 (15:24 -0400)
committer nhmall <nhmall@nethack.org>
Mon, 17 Jun 2019 19:24:53 +0000 (15:24 -0400)
diff --cc src/cmd.c
Simple merge
diff --cc src/mon.c
Simple merge
diff --cc src/options.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Mon, 17 Jun 2019 19:24:53 +0000 (15:24 -0400)
committer	nhmall <nhmall@nethack.org>
	Mon, 17 Jun 2019 19:24:53 +0000 (15:24 -0400)
		1	2
src/cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/options.c	patch \|	diff1 \|	diff2 \|	blob \| history