Merge branch 'master' into win32-x64-working

diff --cc include/extern.h
index 9b77f0d2ef6bc7a9f182ca392f86e39aea559ce7,9de55e169b5210c37fdb13c085bc3c4699723c9a..e89fade1d4ba44f72ddbfc00b85e935f63cc715b
--- 1/include/extern.h
--- 2/include/extern.h
+++ b/include/extern.h
@@@ -751,9 -751,9 +751,9 @@@ E int FDECL(nhclose, (int))
  E void NDECL(really_close);
  #endif
  #ifdef DEBUG
 -E boolean FDECL(showdebug, (const char *));
 +E boolean FDECL(debugcore, (const char *, boolean));
  #endif
- E void FDECL(read_tribute, (const char *,const char *,int));
+ E boolean FDECL(read_tribute, (const char *,const char *,int));
  
  /* ### fountain.c ### */
  

diff --cc src/files.c
Simple merge