Merge branch 'NetHack-3.6'

diff --cc src/mapglyph.c
Simple merge

diff --cc src/options.c
Simple merge

diff --cc src/windows.c
Simple merge

diff --cc sys/amiga/winami.c
Simple merge

diff --cc sys/wince/mswproc.c
Simple merge

diff --cc sys/winnt/nttty.c
Simple merge

diff --cc win/Qt/qt_win.cpp
Simple merge

diff --cc win/Qt4/qt4bind.cpp
Simple merge

diff --cc win/X11/winX.c
Simple merge

diff --cc win/curses/cursmain.c
Simple merge

diff --cc win/gem/wingem.c
Simple merge

diff --cc win/gnome/gnbind.c
Simple merge

diff --cc win/tty/termcap.c
Simple merge

diff --cc win/tty/wintty.c
index 011763499c4cac61317d3a33343dcd9b415f1503,bcd039a71365a8df31f04be54cf25bbfef68214e..8bbcaca32ca7c6d128fbb3e49d040dbe7af0d898
--- 1/win/tty/wintty.c
--- 2/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@@ -4304,10 -4311,10 +4309,10 @@@ unsigned long *bmarray
     the condition where this gets used always has the same value */
  #define condcolor(bm,bmarray) NO_COLOR
  #define term_start_color(color) /*empty*/
- #define term_end_color(color) /*empty*/
+ #define term_end_color() /*empty*/
  #endif /* TEXTCOLOR */
  
 -STATIC_OVL int
 +static int
  condattr(bm, bmarray)
  long bm;
  unsigned long *bmarray;

diff --cc win/win32/mswproc.c
Simple merge