]> granicus.if.org Git - nethack/commitdiff
projects / nethack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eed004 b901acc)
Merge branch 'master' into win32-x64-working
authornhmall <mjnh@persona.ca>
Thu, 7 May 2015 09:00:36 +0000 (05:00 -0400)
committernhmall <mjnh@persona.ca>
Thu, 7 May 2015 09:00:36 +0000 (05:00 -0400)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.