]> granicus.if.org Git - nethack/commitdiff
projects / nethack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fccf0e8 b33c338)
Merge branch 'master' into win32-x64-working
authornhmall <mjnh@persona.ca>
Tue, 16 Jun 2015 10:34:05 +0000 (06:34 -0400)
committernhmall <mjnh@persona.ca>
Tue, 16 Jun 2015 10:34:05 +0000 (06:34 -0400)
Conflicts:
include/flag.h


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