]> granicus.if.org Git - nethack/commitdiff
Merge branch 'master' into win32-x64-working
authornhmall <mjnh@persona.ca>
Sat, 20 Jun 2015 12:40:13 +0000 (08:40 -0400)
committernhmall <mjnh@persona.ca>
Sat, 20 Jun 2015 12:40:13 +0000 (08:40 -0400)

Trivial merge