Merge branch 'NetHack-3.6'

author nhmall <nhmall@nethack.org>

Thu, 20 Jun 2019 14:18:32 +0000 (10:18 -0400)

committer nhmall <nhmall@nethack.org>

Thu, 20 Jun 2019 14:18:32 +0000 (10:18 -0400)
author nhmall <nhmall@nethack.org>
Thu, 20 Jun 2019 14:18:32 +0000 (10:18 -0400)
committer nhmall <nhmall@nethack.org>
Thu, 20 Jun 2019 14:18:32 +0000 (10:18 -0400)
diff --cc include/hack.h
Simple merge
diff --cc src/cmd.c
Simple merge
diff --cc src/options.c
Simple merge
diff --cc win/curses/cursdial.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Thu, 20 Jun 2019 14:18:32 +0000 (10:18 -0400)
committer	nhmall <nhmall@nethack.org>
	Thu, 20 Jun 2019 14:18:32 +0000 (10:18 -0400)
		1	2
include/hack.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/options.c	patch \|	diff1 \|	diff2 \|	blob \| history
win/curses/cursdial.c	patch \|	diff1 \|	diff2 \|	blob \| history