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

diff --cc .gitignore
Simple merge

diff --cc include/decl.h
Simple merge

diff --cc include/flag.h
Simple merge

diff --cc include/hack.h
Simple merge

diff --cc src/attrib.c
Simple merge

diff --cc src/do.c
Simple merge

diff --cc src/do_name.c
Simple merge

diff --cc src/eat.c
Simple merge

diff --cc src/files.c
index 95273727526174d84f7ed81be6828ef8913f77b6,8e942f757419b96c5b7f1d1d2b367e981df82c1e..77d266c32bc743ac7e5617cdc4d333f33b81e234
--- 1/src/files.c
--- 2/src/files.c
+++ b/src/files.c
@@@ -1,5 -1,5 +1,5 @@@
- /* NetHack 3.5        files.c $NHDT-Date: 1427337311 2015/03/26 02:35:11 $  $NHDT-Branch: derek-farming $:$NHDT-Revision: 1.141 $ */
+ /* NetHack 3.5        files.c $NHDT-Date: 1428972596 2015/04/14 00:49:56 $  $NHDT-Branch: master $:$NHDT-Revision: 1.164 $ */
 -/* NetHack 3.5        files.c $Date: 2012/03/10 02:49:08 $  $Revision: 1.124 $ */
 +
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/hack.c
Simple merge

diff --cc src/mklev.c
Simple merge

diff --cc src/options.c
Simple merge

diff --cc src/potion.c
index d95395083bb8aad233f9d05f08e06d7e587f7588,e669018d3838153a3187dfee51dde824ca6db158..05bf99a3c6b3d3c5c9d4f85383458489929f07a1
--- 1/src/potion.c
--- 2/src/potion.c
+++ b/src/potion.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        potion.c        $NHDT-Date: 1426953330 2015/03/21 15:55:30 $  $NHDT-Branch: master $:$NHDT-Revision: 1.99 $ */
+ /* NetHack 3.5        potion.c        $NHDT-Date: 1428972597 2015/04/14 00:49:57 $  $NHDT-Branch: master $:$NHDT-Revision: 1.111 $ */
 -/* NetHack 3.5        potion.c        $Date: 2013/11/05 00:57:55 $  $Revision: 1.91 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/pray.c
Simple merge

diff --cc src/sp_lev.c
Simple merge

diff --cc sys/winnt/Makefile.msc
Simple merge

diff --cc win/win32/vs2010/NetHackW.vcxproj
Simple merge