]> granicus.if.org Git - nethack/commit
Merge branch 'master' into nhmall-booktribute
authornhmall <mjnh@persona.ca>
Sun, 12 Apr 2015 14:02:17 +0000 (10:02 -0400)
committernhmall <mjnh@persona.ca>
Sun, 12 Apr 2015 14:02:17 +0000 (10:02 -0400)
commit11560933ccffced9a1de3d06d989de8a7da39dd2
treeb79cc114556b0aea441c37709b3d8702e8f0c125
parent7e098c0c4ea94b0295d8e7cd33f284041f5f8f40
parenta7b4309cc1de988d11fc9c836559c9a9b9b7f0d9
Merge branch 'master' into nhmall-booktribute

Conflicts:
doc/fixes35.0
include/extern.h
src/mkobj.c
src/mon.c
src/objnam.c
win/share/objects.txt
doc/fixes35.0
include/extern.h
include/obj.h
src/files.c
src/mkobj.c
src/mon.c
src/objects.c
src/objnam.c
src/trap.c
src/zap.c
win/share/objects.txt