]> granicus.if.org Git - nethack/commitdiff
Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource
authorkarnov <karnov@sympatico.ca>
Fri, 29 May 2015 01:56:34 +0000 (21:56 -0400)
committerkarnov <karnov@sympatico.ca>
Fri, 29 May 2015 01:56:34 +0000 (21:56 -0400)
Resync prior to pushing tribute changes.


Trivial merge