Merge remote-tracking branch 'github/tung/shop-floor-nested-loot' into NetHack-3.6.0

author Sean Hunt <scshunt@csclub.uwaterloo.ca>

Wed, 13 Apr 2016 01:32:10 +0000 (21:32 -0400)

committer Sean Hunt <scshunt@csclub.uwaterloo.ca>

Wed, 13 Apr 2016 01:32:10 +0000 (21:32 -0400)
author Sean Hunt <scshunt@csclub.uwaterloo.ca>
Wed, 13 Apr 2016 01:32:10 +0000 (21:32 -0400)
committer Sean Hunt <scshunt@csclub.uwaterloo.ca>
Wed, 13 Apr 2016 01:32:10 +0000 (21:32 -0400)
diff --cc src/pickup.c
Simple merge
diff --cc src/shk.c
Simple merge
author	Sean Hunt <scshunt@csclub.uwaterloo.ca>
	Wed, 13 Apr 2016 01:32:10 +0000 (21:32 -0400)
committer	Sean Hunt <scshunt@csclub.uwaterloo.ca>
	Wed, 13 Apr 2016 01:32:10 +0000 (21:32 -0400)
		1	2
src/pickup.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shk.c	patch \|	diff1 \|	diff2 \|	blob \| history