From: nhmall <mjnh@persona.ca>
Date: Fri, 18 Dec 2015 17:56:38 +0000 (-0500)
Subject: Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into... 
X-Git-Tag: NetHack-3.6.1_RC01~1149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2765790b2469e6f4a90b204eff45b0b07913457a;p=nethack

Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.0

Conflicts:
	doc/fixes36.1
---

2765790b2469e6f4a90b204eff45b0b07913457a
diff --cc doc/fixes36.1
index b307e0b74,22e70e2ec..9b47321e5
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@@ -40,7 -40,8 +40,9 @@@ don't show the old level when you die g
          iron ball
  new high score with ", while helpless" attribute appended would erroneously
  	result in ", while helpless" being appended to all scores
+ allow bright aliases for colors in menucolors
+ make MAXPLAYERS option in sysconf accept 0 value
 +avoid hearing yelps when you are deaf
  
  
  Platform- and/or Interface-Specific Fixes