Merge branch 'master' into win32-x64-working

Conflicts:
	src/do_name.c
	src/trap.c
	src/zap.c
	win/X11/winmenu.c

diff --cc include/extern.h
Simple merge

diff --cc src/do_name.c
index bea95a2988d43b05a630634001a7e8381677ceb3,c8a49a443283b2b097518fba5dac8130c27ef316..11ad9a805b20fd97bb0e6c30a552e786ab0a33ae
--- 1/src/do_name.c
--- 2/src/do_name.c
+++ b/src/do_name.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        do_name.c       $NHDT-Date: 1426558927 2015/03/17 02:22:07 $  $NHDT-Branch: master $:$NHDT-Revision: 1.53 $ */
+ /* NetHack 3.5        do_name.c       $NHDT-Date: 1428196077 2015/04/05 01:07:57 $  $NHDT-Branch: nhmall-booktribute $:$NHDT-Revision: 1.64 $ */
 -/* NetHack 3.5        do_name.c       $Date: 2012/01/29 03:00:17 $  $Revision: 1.49 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/files.c
Simple merge

diff --cc src/mkobj.c
Simple merge

diff --cc src/mon.c
Simple merge

diff --cc src/read.c
Simple merge

diff --cc src/trap.c
index 503ecb42c38fd635a172aed3536995173eed8e58,aff2b971954d47f3da2a06364a79696e18dfff0d..6f894ce5a33460b31c4ccb0dc6f8460d2b74e0c4
--- 1/src/trap.c
--- 2/src/trap.c
+++ b/src/trap.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        trap.c  $NHDT-Date: 1427934551 2015/04/02 00:29:11 $  $NHDT-Branch: master $:$NHDT-Revision: 1.223 $ */
+ /* NetHack 3.5        trap.c  $NHDT-Date: 1428207616 2015/04/05 04:20:16 $  $NHDT-Branch: nhmall-booktribute $:$NHDT-Revision: 1.224 $ */
 -/* NetHack 3.5        trap.c  $Date: 2013/03/14 01:58:21 $  $Revision: 1.179 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/zap.c
index fc4e0f8b5406b4d9b36021e3de1ed82a8cd11773,89438b6c24a5c313541704e3b64ef9e4b183ef2a..309c6cef6cd4981b7d7277257db0f727c6315269
--- 1/src/zap.c
--- 2/src/zap.c
+++ b/src/zap.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        zap.c   $NHDT-Date: 1427782839 2015/03/31 06:20:39 $  $NHDT-Branch: master $:$NHDT-Revision: 1.200 $ */
+ /* NetHack 3.5        zap.c   $NHDT-Date: 1428207622 2015/04/05 04:20:22 $  $NHDT-Branch: nhmall-booktribute $:$NHDT-Revision: 1.215 $ */
 -/* NetHack 3.5        zap.c   $Date: 2013/11/05 00:57:56 $  $Revision: 1.183 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

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

diff --cc win/X11/winmenu.c
index 9cb52681be1f78ba05a31689c74beefc5abf987d,e21988c70eb6883ce18cd9d8e3065732344b5809..65929494e814e12f15c5cf8da1c9ac36515bfa7d
--- 1/win/X11/winmenu.c
--- 2/win/X11/winmenu.c
+++ b/win/X11/winmenu.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        winmenu.c       $NHDT-Date: 1427881480 2015/04/01 09:44:40 $  $NHDT-Branch: master $:$NHDT-Revision: 1.5 $ */
+ /* NetHack 3.5        winmenu.c       $NHDT-Date: 1428828477 2015/04/12 08:47:57 $  $NHDT-Branch: master $:$NHDT-Revision: 1.7 $ */
 -/* NetHack 3.5        winmenu.c       $Date: 2009/05/06 10:55:53 $  $Revision: 1.5 $ */
  /*    SCCS Id: @(#)winmenu.c  3.5     1996/08/15      */
  /* Copyright (c) Dean Luick, 1992                               */
  /* NetHack may be freely redistributed.  See license for details. */

diff --cc win/tty/wintty.c
Simple merge