From: Derek S. Ray <derekray@gmail.com>
Date: Wed, 15 Apr 2015 22:30:13 +0000 (-0400)
Subject: Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource... 
X-Git-Tag: NetHack-3.6.0_RC01~414^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c644c15074a0d6f90141e37b1a6b84211511110;p=nethack

Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource into win32-x64-working

* 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource: (27 commits)
  Makefile bit
  gcc Makefile updates for recent file additions
  ...

Conflicts:
	src/files.c
---

7c644c15074a0d6f90141e37b1a6b84211511110