]> granicus.if.org Git - nethack/commitdiff
projects / nethack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b46e61d 29617ad)
Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource
authornhmall <mjnh@persona.ca>
Fri, 29 May 2015 01:56:42 +0000 (21:56 -0400)
committernhmall <mjnh@persona.ca>
Fri, 29 May 2015 01:56:42 +0000 (21:56 -0400)
Conflicts:
src/artifact.c


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