From: nhmall <mjnh@persona.ca>
Date: Mon, 11 Jan 2016 23:35:50 +0000 (-0500)
Subject: Merge branch 'NetHack-3.6.0' into win32-guitty
X-Git-Tag: NetHack-3.6.1_RC01~1024^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e52c605a98683449a36bdd890311fd1933f9f71;p=nethack

Merge branch 'NetHack-3.6.0' into win32-guitty
---

7e52c605a98683449a36bdd890311fd1933f9f71