]> granicus.if.org Git - nethack/commitdiff
Merge branch 'master' into win32-x64-working
authornhmall <mjnh@persona.ca>
Sat, 25 Apr 2015 02:40:46 +0000 (22:40 -0400)
committernhmall <mjnh@persona.ca>
Sat, 25 Apr 2015 02:40:46 +0000 (22:40 -0400)

Trivial merge