nhmall 2cfa05cde1 Merge branch 'master' into win32-x64-working ...

Conflicts:
	include/config.h
	include/extern.h
	src/do.c
	src/files.c
	src/hack.c
	src/mkobj.c
	src/mon.c
	src/objnam.c
	src/vision.c
	sys/share/pcmain.c
	win/share/other.txt
	win/share/renumtiles.pl

2015-04-12 00:15:40 -04:00

..

.gitattributes

NHDT substitution version 2.

2015-03-31 09:50:02 -04:00

.gitignore

Update .gitignore files.

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

dgn_comp.l

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

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

dgn_comp.y

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

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

dgn_main.c

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

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

dlb_main.c

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

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

lev_comp.l

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

lev_comp.y

revisit variable arguments in new lev_comp

2015-04-10 01:39:55 -07:00

lev_main.c

Minor special level and compiler tweakage

2015-04-10 16:47:32 +03:00

makedefs.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

mdgrep.h

Make WIZARD unconditional.

2015-03-17 18:46:17 +02:00

mdgrep.pl

Make WIZARD unconditional.

2015-03-17 18:46:17 +02:00

panic.c

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

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

recover.c

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

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