Merge branch 'NetHack-3.6'

author nhmall <nhmall@nethack.org>

Sat, 15 Jun 2019 12:54:45 +0000 (08:54 -0400)

committer nhmall <nhmall@nethack.org>

Sat, 15 Jun 2019 12:54:45 +0000 (08:54 -0400)
author nhmall <nhmall@nethack.org>
Sat, 15 Jun 2019 12:54:45 +0000 (08:54 -0400)
committer nhmall <nhmall@nethack.org>
Sat, 15 Jun 2019 12:54:45 +0000 (08:54 -0400)
diff --cc src/do_name.c
Simple merge
diff --cc src/mon.c
Simple merge
diff --cc win/tty/topl.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Sat, 15 Jun 2019 12:54:45 +0000 (08:54 -0400)
committer	nhmall <nhmall@nethack.org>
	Sat, 15 Jun 2019 12:54:45 +0000 (08:54 -0400)
		1	2
src/do_name.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon.c	patch \|	diff1 \|	diff2 \|	blob \| history
win/tty/topl.c	patch \|	diff1 \|	diff2 \|	blob \| history