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

(required manual merge in include/config.h)

diff --cc include/config.h
index e4bb58b0704cd6df9f43456f30365df80dd837b5,c3234839ceedbc11e5eeeb1dcb0ae579dd87746f..e7c471928228780ea9459baed9dda1788b4908d6
--- 1/include/config.h
--- 2/include/config.h
+++ b/include/config.h
@@@ -514,19 -514,11 +514,24 @@@ typedef unsigned char uchar
     but it isn't necessary for successful operation of the program */
  #define FREE_ALL_MEMORY             /* free all memory at exit */
  
+ /* EDIT_GETLIN makes the string input in TTY, Qt4, and X11
+    so some prompts will remember the previously input text
+    (within the same session) */
+ /* #define EDIT_GETLIN */
+ 
 +/* Section 4b - Features causing save file incompatibility
 + * Features listed in this section change the format of save and/or
 + * bones files, so in addition to the warning at the start of Section 4
 + * games using these features will not be compatible with previously saved
 + * games (and may not be compatible with anything in the future as well).
 + * To emphasize the point, you must: */
 +/* #define BREAK_360_SAVE_COMPAT */
 +/* to enable them. */
 +
 +#ifdef BREAK_360_SAVE_COMPAT
 +# define CONWAY                        /* Conway's Life level */
 +#endif
 +
  /* #define DUMPLOG */  /* End-of-game dump logs */
  #ifdef DUMPLOG
  

diff --cc include/sp_lev.h
Simple merge

diff --cc include/you.h
Simple merge

diff --cc src/makemon.c
Simple merge

diff --cc src/mhitm.c
Simple merge

diff --cc src/mkmaze.c
Simple merge

diff --cc src/sp_lev.c
Simple merge

diff --cc util/makedefs.c
Simple merge