Merge branch 'master' into win32-x64-working

Conflicts:
	include/extern.h
	src/do.c
	src/mon.c

 Changes to be committed:
	modified:   include/extern.h
	modified:   src/ball.c
	modified:   src/do.c
	modified:   src/eat.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mon.c
	modified:   src/pickup.c
	modified:   src/pline.c
	modified:   src/save.c
	modified:   src/sp_lev.c
	modified:   src/steed.c
	modified:   src/trap.c
	modified:   src/uhitm.c

diff --cc include/extern.h
index fe808d110e05cf72a4467b723377743610481bd4,491b8436725d0e37e8b035a3d3ad412b1d2e633f..a3ba6b7203a90c432579866a1b55c3bf3915a5f7
--- 1/include/extern.h
--- 2/include/extern.h
+++ b/include/extern.h
@@@ -751,7 -753,7 +753,8 @@@ E int FDECL(nhclose, (int))
  E void NDECL(really_close);
  #endif
  #ifdef DEBUG
 +E boolean FDECL(debugcore, (const char *, boolean));
+ E boolean FDECL(showdebug, (const char *));
  #endif
  E boolean FDECL(read_tribute, (const char *,const char *,int));
  

diff --cc src/do.c
index 27255d030c3c521de68982a60a46f5621add39ec,97c11a8efbe718df8912cb535218c72b68155b06..6f909b0f3da08334aa1efc3787c497784a46f3ba
--- 1/src/do.c
--- 2/src/do.c
+++ b/src/do.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        do.c    $NHDT-Date: 1426991040 2015/03/22 02:24:00 $  $NHDT-Branch: master $:$NHDT-Revision: 1.111 $ */
+ /* NetHack 3.5        do.c    $NHDT-Date: 1429666911 2015/04/22 01:41:51 $  $NHDT-Branch: master $:$NHDT-Revision: 1.130 $ */
 -/* NetHack 3.5        do.c    $Date: 2014/11/18 03:10:39 $  $Revision: 1.101 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/eat.c
Simple merge

diff --cc src/hack.c
Simple merge

diff --cc src/mon.c
index 1ecbfd88ebacc5a8a2ad053fc013fa41ee59afbb,3a2fc402b9e351ee62c2d16304127d17b47651a0..d8e138288207858a93b5d45c6a6c3b3e9db38b8c
--- 1/src/mon.c
--- 2/src/mon.c
+++ b/src/mon.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        mon.c   $NHDT-Date: 1429584308 2015/04/21 02:45:08 $  $NHDT-Branch: master $:$NHDT-Revision: 1.164 $ */
+ /* NetHack 3.5        mon.c   $NHDT-Date: 1429666918 2015/04/22 01:41:58 $  $NHDT-Branch: master $:$NHDT-Revision: 1.165 $ */
 -/* NetHack 3.5        mon.c   $Date: 2012/05/16 02:15:10 $  $Revision: 1.126 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/pickup.c
Simple merge

diff --cc src/save.c
Simple merge

diff --cc src/sp_lev.c
Simple merge

diff --cc src/trap.c
Simple merge