Merge remote-tracking branch 'origin/NetHack-3.6.0'

(required manual merge in include/config.h)
2018-04-15 13:50:59 -04:00
parent 123268e0c9 206f9e43e9
commit 6cf611cbc7
75 changed files with 5333 additions and 5062 deletions
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -2789,6 +2789,7 @@ do_objs()
                prefix = -1;
                break;
            }
+            /*FALLTHRU*/
        default:
            Fprintf(ofp, "#define\t");
        }