Merge branch 'win-minor' of https://rodney.nethack.org:20040/git/NHsource into win...

author Bart House <bart@barthouse.com>

Thu, 13 Dec 2018 05:46:32 +0000 (21:46 -0800)

committer Bart House <bart@barthouse.com>

Thu, 13 Dec 2018 05:46:32 +0000 (21:46 -0800)
author Bart House <bart@barthouse.com>
Thu, 13 Dec 2018 05:46:32 +0000 (21:46 -0800)
committer Bart House <bart@barthouse.com>
Thu, 13 Dec 2018 05:46:32 +0000 (21:46 -0800)
diff --cc include/extern.h
Simple merge
diff --cc src/cmd.c
Simple merge
author	Bart House <bart@barthouse.com>
	Thu, 13 Dec 2018 05:46:32 +0000 (21:46 -0800)
committer	Bart House <bart@barthouse.com>
	Thu, 13 Dec 2018 05:46:32 +0000 (21:46 -0800)
		1	2
include/extern.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history