nhmall 3d3ee78a0b Merge branch 'master' into win32-x64-working ...

Conflicts:
	src/files.c
	src/potion.c
	sys/winnt/Makefile.msc

 Changes to be committed:
	modified:   .gitignore
	modified:   DEVEL/hooksdir/nhsub
	modified:   dat/.gitignore
	modified:   dat/opthelp
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
	modified:   doc/fixes35.0
	modified:   include/context.h
	modified:   include/decl.h
	modified:   include/extern.h
	modified:   include/flag.h
	modified:   include/hack.h
	modified:   include/patchlevel.h
	modified:   src/apply.c
	modified:   src/attrib.c
	modified:   src/decl.c
	modified:   src/do.c
	modified:   src/do_name.c
	modified:   src/dothrow.c
	modified:   src/eat.c
	modified:   src/files.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mklev.c
	modified:   src/mondata.c
	modified:   src/monmove.c
	modified:   src/music.c
	modified:   src/options.c
	modified:   src/potion.c
	modified:   src/pray.c
	modified:   src/sit.c
	modified:   src/sp_lev.c
	modified:   src/uhitm.c
	modified:   sys/share/posixregex.c
	modified:   sys/winnt/Makefile.msc
	modified:   util/.gitignore
	modified:   win/win32/vs2010/NetHackW.vcxproj

2015-04-14 18:23:48 -04:00

..

vs2010

Merge branch 'master' into win32-x64-working

2015-04-14 18:23:48 -04:00

vs2013

yet more integration bits (thanks to my typo)

2015-04-12 16:48:06 -04:00

.gitignore

Exclude all the Win32 build artifacts (Studio and otherwise)

2015-03-17 18:44:53 +02:00

dgnstuff.mak

A batch of manual header var additions.

2015-03-17 18:45:42 +02:00

levstuff.mak

Merge branch 'master' into paxed-new_lev_comp

2015-03-21 19:39:48 +02:00

mhaskyn.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhaskyn.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mhdlg.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhdlg.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mhfont.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhfont.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mhinput.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mhinput.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mhmain.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhmain.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mhmap.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhmap.h

Add menucolors

2015-04-02 20:16:25 +03:00

mhmenu.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhmenu.h

visual studio mods for tribute, sysconf

2015-04-12 10:58:13 -04:00

mhmsg.h

win32_gui: follow-up bit on x64 patch (premature optimization)

2015-04-14 09:33:05 -07:00

mhmsgwnd.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhmsgwnd.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mhrip.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhrip.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mhsplash.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhsplash.h

A batch of manual header var additions.

2015-03-17 18:45:42 +02:00

mhstatus.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhstatus.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mhtext.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

mhtext.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mnsel.uu

W340-4 (from <Someone>)

2002-03-24 23:57:19 +00:00

mnselcnt.uu

W340-4 (from <Someone>)

2002-03-24 23:57:19 +00:00

mnunsel.uu

W340-4 (from <Someone>)

2002-03-24 23:57:19 +00:00

mswproc.c

win32_gui: follow-up bit on x64 patch (premature optimization)

2015-04-14 09:33:05 -07:00

petmark.uu

Remove extraneous line from petmark.uu

2002-01-24 23:55:45 +00:00

resource.h

win32gui message history; also clipboard support (from <Someone>)

2003-10-13 14:48:13 +00:00

rip.uu

new RIP integration

2002-03-03 16:51:46 +00:00

splash.uu

splash screen patches (from <Someone>)

2002-11-03 15:26:41 +00:00

tiles.mak

A batch of manual header var additions.

2015-03-17 18:45:42 +02:00

winhack.c

win32_gui: gettting x64 build to work

2015-04-14 08:54:44 -07:00

winhack.rc

win32 embedded version info

2006-06-14 10:48:09 +00:00

winMS.h

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00