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

author Derek S. Ray <derekray@gmail.com>

Wed, 15 Apr 2015 22:30:13 +0000 (18:30 -0400)

committer Derek S. Ray <derekray@gmail.com>

Wed, 15 Apr 2015 22:30:13 +0000 (18:30 -0400)
author Derek S. Ray <derekray@gmail.com>
Wed, 15 Apr 2015 22:30:13 +0000 (18:30 -0400)
committer Derek S. Ray <derekray@gmail.com>
Wed, 15 Apr 2015 22:30:13 +0000 (18:30 -0400)
diff --cc include/extern.h
Simple merge
diff --cc include/hack.h
Simple merge
diff --cc src/files.c
Simple merge
author	Derek S. Ray <derekray@gmail.com>
	Wed, 15 Apr 2015 22:30:13 +0000 (18:30 -0400)
committer	Derek S. Ray <derekray@gmail.com>
	Wed, 15 Apr 2015 22:30:13 +0000 (18:30 -0400)
		1	2
include/extern.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/hack.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/files.c	patch \|	diff1 \|	diff2 \|	blob \| history