nhmall
3d3ee78a0b
Merge branch 'master' into win32-x64-working
Conflicts:
src/files.c
src/potion.c
sys/winnt/Makefile.msc
Changes to be committed:
modified: .gitignore
modified: DEVEL/hooksdir/nhsub
modified: dat/.gitignore
modified: dat/opthelp
modified: doc/Guidebook.mn
modified: doc/Guidebook.tex
modified: doc/fixes35.0
modified: include/context.h
modified: include/decl.h
modified: include/extern.h
modified: include/flag.h
modified: include/hack.h
modified: include/patchlevel.h
modified: src/apply.c
modified: src/attrib.c
modified: src/decl.c
modified: src/do.c
modified: src/do_name.c
modified: src/dothrow.c
modified: src/eat.c
modified: src/files.c
modified: src/hack.c
modified: src/invent.c
modified: src/lock.c
modified: src/mklev.c
modified: src/mondata.c
modified: src/monmove.c
modified: src/music.c
modified: src/options.c
modified: src/potion.c
modified: src/pray.c
modified: src/sit.c
modified: src/sp_lev.c
modified: src/uhitm.c
modified: sys/share/posixregex.c
modified: sys/winnt/Makefile.msc
modified: util/.gitignore
modified: win/win32/vs2010/NetHackW.vcxproj
2015-04-14 18:23:48 -04:00
..
2015-02-27 16:00:58 -05:00
2015-02-27 16:00:58 -05:00
2015-02-27 16:00:58 -05:00
2015-04-10 23:52:15 -04:00
2015-02-27 16:00:58 -05:00
2015-02-27 16:00:58 -05:00
2015-02-27 16:00:58 -05:00
2015-04-14 18:23:48 -04:00
2015-02-27 16:00:58 -05:00
2015-02-27 16:00:58 -05:00
2015-02-27 16:00:58 -05:00
2015-02-27 16:00:58 -05:00
2015-02-27 16:00:58 -05:00