From: nhmall <mjnh@persona.ca>
Date: Tue, 2 Jun 2015 02:13:41 +0000 (-0400)
Subject: Merge branch 'master' into status_hilite
X-Git-Tag: NetHack-3.6.0_RC01~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9999ba970061e1435d933fae697bdb6940637c5a;p=nethack

Merge branch 'master' into status_hilite

Conflicts:
	include/extern.h
	win/tty/wintty.c
---

9999ba970061e1435d933fae697bdb6940637c5a