Merge branch 'NetHack-3.6'

author nhmall <nhmall@nethack.org>

Sun, 12 May 2019 19:31:31 +0000 (15:31 -0400)

committer nhmall <nhmall@nethack.org>

Sun, 12 May 2019 19:31:31 +0000 (15:31 -0400)
author nhmall <nhmall@nethack.org>
Sun, 12 May 2019 19:31:31 +0000 (15:31 -0400)
committer nhmall <nhmall@nethack.org>
Sun, 12 May 2019 19:31:31 +0000 (15:31 -0400)
diff --cc include/ntconf.h
Simple merge
diff --cc src/dlb.c
Simple merge
diff --cc util/makedefs.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Sun, 12 May 2019 19:31:31 +0000 (15:31 -0400)
committer	nhmall <nhmall@nethack.org>
	Sun, 12 May 2019 19:31:31 +0000 (15:31 -0400)
		1	2
include/ntconf.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/dlb.c	patch \|	diff1 \|	diff2 \|	blob \| history
util/makedefs.c	patch \|	diff1 \|	diff2 \|	blob \| history