Merge remote-tracking branch 'github/tung/shop-floor-nested-loot' into NetHack-3.6.0
authorSean Hunt <scshunt@csclub.uwaterloo.ca>
Wed, 13 Apr 2016 01:32:10 +0000 (21:32 -0400)
committerSean Hunt <scshunt@csclub.uwaterloo.ca>
Wed, 13 Apr 2016 01:32:10 +0000 (21:32 -0400)
commitbca851d7115172ff1557007206b1ea51dfcefddf
tree7dfccbcf1f1924f407a6f4347d274b870d3eede8
parent148a7cb26f67d23b1d9dfb55a9ac0ee669b21342
parent82386643a0dcf59c60869507a4e84a1690f1f1e1
Merge remote-tracking branch 'github/tung/shop-floor-nested-loot' into NetHack-3.6.0
src/pickup.c
src/shk.c