Merge branch 'NetHack-3.6.0'

diff --cc DEVEL/Developer.txt
Simple merge

diff --cc DEVEL/git_recipes.txt
Simple merge

diff --cc DEVEL/hooksdir/nhsub
Simple merge

diff --cc doc/makedefs.6
Simple merge

diff --cc include/config.h
index e7c471928228780ea9459baed9dda1788b4908d6,828131ecdd3a8bf9d9e9d4ea7ac170990f70a5f7..f2428075a474f87c8caeb264748c34865e30d862
--- 1/include/config.h
--- 2/include/config.h
+++ b/include/config.h
@@@ -1,5 -1,6 +1,6 @@@
 -/* NetHack 3.6        config.h        $NHDT-Date: 1447728911 2015/11/17 02:55:11 $  $NHDT-Branch: master $:$NHDT-Revision: 1.91 $ */
 +/* NetHack 3.6        config.h        $NHDT-Date: 1478740241 2016/11/10 01:10:41 $  $NHDT-Branch: master $:$NHDT-Revision: 1.100 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
+ /*-Copyright (c) Robert Patrick Rankin, 2016. */
  /* NetHack may be freely redistributed.  See license for details. */
  
  #ifndef CONFIG_H /* make sure the compiler does not see the typedefs twice */

diff --cc include/decl.h
Simple merge

diff --cc include/global.h
Simple merge

diff --cc include/rm.h
Simple merge

diff --cc include/you.h
Simple merge

diff --cc src/allmain.c
Simple merge

diff --cc src/bones.c
Simple merge

diff --cc src/decl.c
Simple merge

diff --cc src/do.c
Simple merge

diff --cc src/makemon.c
Simple merge

diff --cc src/mhitm.c
Simple merge

diff --cc src/mklev.c
Simple merge

diff --cc src/mkmaze.c
Simple merge

diff --cc src/monst.c
Simple merge

diff --cc sys/unix/Makefile.dat
Simple merge

diff --cc util/makedefs.c
Simple merge

diff --cc util/mdgrep.pl
Simple merge