Merge branch 'master' into win32-x64-working

Conflicts:
	src/end.c
	src/files.c
	src/options.c

diff --cc src/do_name.c
Simple merge

diff --cc src/end.c
index 75726beb806f2f1d8d32eadfeb094009c23302ec,f3d3928a26b7cf0b016f4ec4db233126fd49afc0..b4a68f85b418b4985129c9f503f623a26fc05aba
--- 1/src/end.c
--- 2/src/end.c
+++ b/src/end.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        end.c   $NHDT-Date: 1425319883 2015/03/02 18:11:23 $  $NHDT-Branch: master $:$NHDT-Revision: 1.81 $ */
+ /* NetHack 3.5        end.c   $NHDT-Date: 1429953061 2015/04/25 09:11:01 $  $NHDT-Branch: master $:$NHDT-Revision: 1.93 $ */
 -/* NetHack 3.5        end.c   $Date: 2012/04/09 02:56:30 $  $Revision: 1.79 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/files.c
index c3aacb9af761e0b8fb7c3f7a3d79f5fc3274a1ee,f50b8c33eb0f370886c46fa8851704a89356a0fb..f5457db195d8f62d952ec99dd4b539efb60925dc
--- 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: 1429675565 2015/04/22 04:06:05 $  $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.169 $ */
+ /* NetHack 3.5        files.c $NHDT-Date: 1429953063 2015/04/25 09:11:03 $  $NHDT-Branch: master $:$NHDT-Revision: 1.166 $ */
 -/* 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/mklev.c
Simple merge

diff --cc src/options.c
index 1b5c6bca046d0e7f822a4c78f7905b8e31e2bec0,1e3d1833883a4ed228f48d479df60b2c5facc52e..ccf0f9e1734e5f725b597117f9f4da1e22655925
--- 1/src/options.c
--- 2/src/options.c
+++ b/src/options.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        options.c       $NHDT-Date: 1429675568 2015/04/22 04:06:08 $  $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.187 $ */
+ /* NetHack 3.5        options.c       $NHDT-Date: 1429953065 2015/04/25 09:11:05 $  $NHDT-Branch: master $:$NHDT-Revision: 1.186 $ */
 -/* NetHack 3.5        options.c       $Date: 2012/04/09 02:56:30 $  $Revision: 1.153 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/shk.c
Simple merge

diff --cc src/zap.c
Simple merge