]> granicus.if.org Git - nethack/commit
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)
commit3bb9ea62dbe87f6c5802dbff47427c04234df87b
treed598b012a6bdc98e76b555657607360c1e2370b8
parentb46e61d486d024a0cedb8113241e8924c692b0ee
parent29617ada12dfeb380eac90db7489db26556c87f5
Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource

Conflicts:
src/artifact.c