Merge branch 'NetHack-3.7'

author nhmall <nhmall@nethack.org>

Sat, 16 Nov 2019 03:23:55 +0000 (22:23 -0500)

committer nhmall <nhmall@nethack.org>

Sat, 16 Nov 2019 03:23:55 +0000 (22:23 -0500)
author nhmall <nhmall@nethack.org>
Sat, 16 Nov 2019 03:23:55 +0000 (22:23 -0500)
committer nhmall <nhmall@nethack.org>
Sat, 16 Nov 2019 03:23:55 +0000 (22:23 -0500)
diff --cc include/decl.h

index c57eafc18938cd2e297cceb8cf0f9b2f04cd1a3d,72f6e605e4560cfb45d1dc50eb113dedb471d6dc..c57eafc18938cd2e297cceb8cf0f9b2f04cd1a3d

mode 100755,100644..100644
--- 1/include/decl.h
--- 2/include/decl.h
+++ b/include/decl.h
diff --cc src/decl.c

index 2d79af408511dfe444410ad9ef91b2edc15365c0,6b68fb1c3923527b85b429fbadad6d0b16e75551..2d79af408511dfe444410ad9ef91b2edc15365c0

mode 100755,100644..100644
--- 1/src/decl.c
--- 2/src/decl.c
+++ b/src/decl.c
author	nhmall <nhmall@nethack.org>
	Sat, 16 Nov 2019 03:23:55 +0000 (22:23 -0500)
committer	nhmall <nhmall@nethack.org>
	Sat, 16 Nov 2019 03:23:55 +0000 (22:23 -0500)
		1	2
include/decl.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/decl.c	patch \|	diff1 \|	diff2 \|	blob \| history