]> granicus.if.org Git - nethack/commitdiff
Merge branch 'master' into win32-x64-working
authornhmall <mjnh@persona.ca>
Sat, 2 May 2015 18:04:17 +0000 (14:04 -0400)
committernhmall <mjnh@persona.ca>
Sat, 2 May 2015 18:04:17 +0000 (14:04 -0400)

Trivial merge