Merge branch 'NetHack-3.6'

author nhmall <nhmall@nethack.org>

Sun, 9 Jun 2019 12:43:40 +0000 (08:43 -0400)

committer nhmall <nhmall@nethack.org>

Sun, 9 Jun 2019 12:43:40 +0000 (08:43 -0400)
author nhmall <nhmall@nethack.org>
Sun, 9 Jun 2019 12:43:40 +0000 (08:43 -0400)
committer nhmall <nhmall@nethack.org>
Sun, 9 Jun 2019 12:43:40 +0000 (08:43 -0400)
diff --cc include/extern.h
Simple merge
diff --cc src/display.c
Simple merge
diff --cc src/muse.c
Simple merge
diff --cc src/read.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Sun, 9 Jun 2019 12:43:40 +0000 (08:43 -0400)
committer	nhmall <nhmall@nethack.org>
	Sun, 9 Jun 2019 12:43:40 +0000 (08:43 -0400)
		1	2
include/extern.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/display.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/muse.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/read.c	patch \|	diff1 \|	diff2 \|	blob \| history