Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

diff --cc Files
index 261e8e799cc7282e07e747b842f416d93adc3e22,f4b7f11ddb68ee0a7d62421761a6e969cc9923c4..e5f931749e6593d247982821bccc70f61c107ae9
--- 1/Files
--- 2/Files
+++ b/Files
@@@ -404,54 -362,38 +404,52 @@@ minetn-7.lev  oracle.lev    orcus.le
  soko1-2.lev   soko2-1.lev   soko2-2.lev   soko3-1.lev   soko3-2.lev   
  soko4-1.lev   soko4-2.lev   tower1.lev    tower2.lev    tower3.lev    
  valley.lev    water.lev     wizard1.lev   wizard2.lev   wizard3.lev   
- 
- (files generated by makedefs at playground creation time)
 +data         dungeon.pdf  options      oracles      quest.dat    rumors       
 +
  (files generated for Qt interface on Mac OS X)
 -nethack.icns    Info.plist
 +Info.plist    nethack.icns  
 +
  (files generated for win32 at compile time)
 -porthelp        dlb.lst
 -(files generated for win32 tty at compile time)
 -ttyoptions
 +dlb.lst   porthelp  
 +
  (files generated for win32 gui at compile time)
 -guioptions
 +guioptions  
 +
 +(files generated for win32 tty at compile time)
 +ttyoptions  
 +
 +(tile files optionally generated for X ports at playground creation time)
 +pet_mark.xbm  rip.xpm       x11tiles      
  
  include:
 +(file for tiles support copied from win/share at compile time)
 +tile.h  
 +
 +(file for win32 that are moved into include at compile time)
 +win32api.h  
 +
  (files generated by makedefs at compile time)
 -date.h          onames.h        pm.h            vis_tab.h
 +date.h     onames.h   pm.h       vis_tab.h  
 +
  (files generated by yacc (or copied from sys/share) at compile time)
 -dgn_comp.h      lev_comp.h
 -(file for tiles support copied from win/share at compile time)
 -tile.h
 -(files for win32 that are moved into include at compile time)
 -win32api.h
 +dgn_comp.h  lev_comp.h  
  
  src:
 +(files for win32 that are moved into src at compile time)
 +Makefile      Makefile.bcc  Makefile.gcc  
 +
 +(files generated by 'moc' for Qt interface at compile time)
 +qt_kde0.moc      qt_win.moc       qttableview.moc  
 +
  (files generated by makedefs at compile time)
 -monstr.c        vis_tab.c
 +monstr.c   vis_tab.c  
 +
  (file optionally generated by tilemap at compile time)
 -tile.c
 -(files generated by 'moc' for Qt interface at compile time)
 -qt_kde0.moc     qt_win.moc      qttableview.moc
 -(files for win32 that are moved into src at compile time)
 -Makefile        Makefile.bcc    Makefile.gcc
 +tile.c  
  
  sys/winnt:
 -(files generated by uudecode at compile time)
 -nethack.ico
 +(file generated by uudecode at compile time)
 +nethack.ico  
  
  util:
  (files generated by lex and yacc (or copied from sys/share) at compile time)