Merge branch 'master' into win32-x64-working

This commit is contained in:
nhmall
2015-04-18 17:47:14 -04:00
4 changed files with 18 additions and 11 deletions

View File

@@ -753,7 +753,7 @@ E void NDECL(really_close);
#ifdef DEBUG
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 ### */