]> granicus.if.org Git - nethack/commit
Merge branch 'master' into win32-x64-working
authornhmall <mjnh@persona.ca>
Mon, 4 May 2015 00:53:04 +0000 (20:53 -0400)
committernhmall <mjnh@persona.ca>
Mon, 4 May 2015 00:53:04 +0000 (20:53 -0400)
commit636edf2b0885409aa6c76ad4d969a4f76355bca8
tree9afc6dbb48386f29443285f684bc77aeb0a199d3
parent8ebf5b175999c0b9d662737cecb6cc6e0090b7f4
parent3fa8ff9d62bbc1d443a8d300db0a032ea64ad588
Merge branch 'master' into win32-x64-working

Conflicts:
src/dig.c
src/mkobj.c

 Changes to be committed:
modified:   src/dig.c
modified:   src/mkobj.c
src/dig.c
src/mkobj.c