From: nhmall <mjnh@persona.ca>
Date: Mon, 1 Jun 2015 13:09:44 +0000 (-0400)
Subject: Merge branch 'master' into status_hilite
X-Git-Tag: NetHack-3.6.0_RC01~312
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec92c2007a07d425857f120690a85a0e173654d4;p=nethack

Merge branch 'master' into status_hilite

Conflicts:
	include/extern.h
	src/options.c
---

ec92c2007a07d425857f120690a85a0e173654d4