From: karnov Date: Fri, 29 May 2015 01:56:34 +0000 (-0400) Subject: Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource X-Git-Tag: NetHack-3.6.0_RC01~335^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=046f3044904885a639c458436bccecb01489ea8b;p=nethack Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource Resync prior to pushing tribute changes. --- 046f3044904885a639c458436bccecb01489ea8b