Merge branch 'feature/sounds' of https://github.com/NullCGT/NetHack into NullCGT...

author nhmall <nhmall@nethack.org>

Mon, 10 Feb 2020 01:38:22 +0000 (20:38 -0500)

committer nhmall <nhmall@nethack.org>

Mon, 10 Feb 2020 01:38:22 +0000 (20:38 -0500)
author nhmall <nhmall@nethack.org>
Mon, 10 Feb 2020 01:38:22 +0000 (20:38 -0500)
committer nhmall <nhmall@nethack.org>
Mon, 10 Feb 2020 01:38:22 +0000 (20:38 -0500)
diff --cc src/monst.c
Simple merge
diff --cc src/sounds.c
Simple merge
author	nhmall <nhmall@nethack.org>
	Mon, 10 Feb 2020 01:38:22 +0000 (20:38 -0500)
committer	nhmall <nhmall@nethack.org>
	Mon, 10 Feb 2020 01:38:22 +0000 (20:38 -0500)
		1	2
src/monst.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/sounds.c	patch \|	diff1 \|	diff2 \|	blob \| history